X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache.git;a=blobdiff_plain;f=apache.spec;h=384e75b58169beff5799019f5aac438159c06d52;hp=aa8e6c8ad4aae0a5b3a64146349988a57f66bd19;hb=0bc39fb;hpb=edda31b5e2d67e14d459a0cdd7eb8c588bb94dc9

diff --git a/apache.spec b/apache.spec
index aa8e6c8..384e75b 100644
--- a/apache.spec
+++ b/apache.spec
@@ -30,7 +30,7 @@
 %define		openssl_ver	0.9.7d
 %define		apr_ver		1:1.2
 %else
-%define		openssl_ver	0.9.8i
+%define		openssl_ver	1.0.1e
 %define		apr_ver		1:1.4.5
 %endif
 %include	/usr/lib/rpm/macros.perl
@@ -43,12 +43,12 @@ Summary(pt_BR.UTF-8):	Servidor HTTPD para prover serviços WWW
 Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
-Version:	2.2.22
-Release:	7
+Version:	2.2.31
+Release:	4
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5:	d77fa5af23df96a8af68ea8114fa6ce1
+# Source0-md5:	bc81bdf42a6c10d0ee9e6908014cc0f5
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -85,13 +85,16 @@ Patch1:		%{name}-layout.patch
 Patch2:		%{name}-suexec.patch
 Patch3:		%{name}-branding.patch
 Patch4:		%{name}-apr.patch
+Patch5:		apache-bug-49058.patch
 # what about this? it isn't applied...
 Patch6:		httpd-2.0.40-xfsz.patch
 Patch7:		%{name}-syslibs.patch
 Patch8:		httpd-2.0.45-encode.patch
 Patch9:		%{name}-paths.patch
 Patch10:	httpd-2.0.46-dav401dest.patch
+Patch11:	apache-bug-39311-preforkonly.patch
 Patch12:	httpd-2.0.46-sslmutex.patch
+Patch13:	apache-bug-50002.patch
 Patch14:	httpd-2.0.48-corelimit.patch
 Patch15:	httpd-2.0.48-debuglog.patch
 Patch18:	%{name}-v6only-ENOPROTOOPT.patch
@@ -105,7 +108,8 @@ Patch26:	apache-mod_vhost_alias_docroot.patch
 # http://mpm-itk.sesse.net/
 Patch28:	apache-mpm-itk.patch
 Patch29:	libtool-tag.patch
-Patch30:	pcre8.30.patch
+Patch30:	apache-bug-39653.patch
+Patch31:	httpd-dummy-connection-result.patch
 URL:		http://httpd.apache.org/
 BuildRequires:	apr-devel >= %{apr_ver}
 BuildRequires:	apr-util-devel >= 1:1.3.10-2
@@ -127,6 +131,7 @@ BuildRequires:	zlib-devel
 Requires:	%{name}-errordocs = %{version}-%{release}
 Requires:	%{name}-mod_alias = %{version}-%{release}
 Requires:	%{name}-mod_auth = %{version}-%{release}
+Requires:	%{name}-mod_authz_default = %{version}-%{release}
 Requires:	%{name}-mod_env = %{version}-%{release}
 Requires:	%{name}-mod_log_config = %{version}-%{release}
 Requires:	%{name}-mod_mime = %{version}-%{release}
@@ -1224,6 +1229,7 @@ Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_headers.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_headers) = %{version}-%{release}
+Provides:	webserver(headers)
 
 %description mod_headers
 This package contains mod_headers module. The module allows for the
@@ -1578,7 +1584,7 @@ Epoch:		1
 Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_ssl.html
 Requires:	%{name}-base = %{version}-%{release}
-Requires:	openssl >= %{openssl_ver}
+%requires_eq_to openssl openssl-devel
 %if "%{pld_release}" != "ac"
 Requires:	apr-util-dbm-db
 %endif
@@ -1781,11 +1787,15 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch12 -p1
+%patch11 -p1
+%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch18 -p1
@@ -1795,9 +1805,10 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
-%patch28 -p1
+%{?with_itk:%patch28 -p1}
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 # using system apr, apr-util and pcre
 %{__rm} -r srclib/{apr,apr-util,pcre}
@@ -2437,10 +2448,10 @@ fi
 %attr(755,root,root) %{_sbindir}/htdigest
 %attr(755,root,root) %{_sbindir}/logresolve
 %attr(755,root,root) %{_sbindir}/rotatelogs
-%{_mandir}/man1/ab.1*
+%{_mandir}/man8/ab.8*
 %{_mandir}/man8/apachectl.8*
 %{_mandir}/man1/htdigest.1*
-%{_mandir}/man1/logresolve.1*
+%{_mandir}/man8/logresolve.8*
 %{_mandir}/man8/rotatelogs.8*
 
 %files devel
@@ -2453,7 +2464,7 @@ fi
 %{_libexecdir}/build/config_vars.mk
 %attr(755,root,root) %{_libexecdir}/build/*.sh
 %{_includedir}
-%{_mandir}/man1/apxs.1*
+%{_mandir}/man8/apxs.8*
 
 %files mod_actions
 %defattr(644,root,root,755)