X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache.spec;h=d2d1313ab09eeb5bb527b474aa91181976cd4c95;hb=6511e2e2ddd032687d8ee0f785924b863ef91987;hp=f7ef3b67b753052b881907dbf9599e630335b144;hpb=5e85d640bbe2caf641aaab68380387cdb230da08;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index f7ef3b6..d2d1313 100644
--- a/apache.spec
+++ b/apache.spec
@@ -21,7 +21,7 @@
 # this is internal macro, don't change to %%apache_modules_api
 %define		_apache_modules_api 20120211
 
-%define		openssl_ver	0.9.8i
+%define		openssl_ver	1.0.1e
 %define		apr_ver		1:1.4.6
 
 %include	/usr/lib/rpm/macros.perl
@@ -34,12 +34,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.4.3
-Release:	1
+Version:	2.4.4
+Release:	5
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5:	538dccd22dd18466fff3ec7948495417
+# Source0-md5:	a2fed766e67c9681e0d9b86768f08286
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -76,6 +76,7 @@ Patch1:		%{name}-layout.patch
 Patch2:		%{name}-suexec.patch
 Patch3:		%{name}-branding.patch
 Patch4:		%{name}-apr.patch
+Patch5:		httpd-dummy-connection-result.patch
 
 Patch7:		%{name}-syslibs.patch
 
@@ -96,7 +97,7 @@ Patch30:	lua-lib.patch
 URL:		http://httpd.apache.org/
 BuildRequires:	apr-devel >= %{apr_ver}
 BuildRequires:	apr-util-devel >= 1:1.3.10-2
-BuildRequires:	autoconf >= 2.13
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 %{?with_distcache:BuildRequires:	distcache-devel}
 BuildRequires:	libtool >= 2:1.5
@@ -205,6 +206,8 @@ Obsoletes:	apache-mod_optional_fn_import
 Obsoletes:	apache-mod_optional_fn_import
 Obsoletes:	apache-mod_optional_hook_import
 Conflicts:	apache < 2.2.0
+# mod_wsgi >= 3.4 is required for apache 2.4
+Conflicts:	apache-mod_wsgi < 3.4
 Conflicts:	logrotate < 3.7-4
 # for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed.
 Conflicts:	rpm < 4.4.2-0.2
@@ -837,8 +840,6 @@ Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.4/mod/mod_authz_host.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_authz_core = %{version}-%{release}
-# provides compatibility directives for 2.2-style access control
-Requires:	apache(mod_access_compat) = %{version}-%{release}
 Provides:	apache(mod_authz_host) = %{version}-%{release}
 # for apache < 2.2.0
 Provides:	apache(mod_access) = %{version}-%{release}
@@ -1212,6 +1213,7 @@ Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.4/mod/mod_deflate.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_headers = %{version}-%{release}
+Requires:	%{name}-mod_filter = %{version}-%{release}
 Provides:	apache(mod_deflate) = %{version}-%{release}
 
 %description mod_deflate
@@ -2585,6 +2587,8 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+
 %patch7 -p1
 
 %patch10 -p1
@@ -2926,8 +2930,8 @@ if [ ! -L /etc/httpd/httpd.conf ]; then
 	ln -s conf.d /etc/httpd/httpd.conf
 fi
 if [ -f /etc/sysconfig/httpd ]; then
-        MPM=$(grep HTTPD_MPM /etc/sysconfig/httpd |sed 's,HTTPD_MPM=,,;s,",,g')
-        if [ -n $MPM ]; then
+        MPM=$(grep ^HTTPD_MPM /etc/sysconfig/httpd |sed 's,HTTPD_MPM=,,;s,",,g')
+        if [ -n "$MPM" ]; then
                 echo "LoadModule mpm_${MPM}_module                modules/mod_mpm_${MPM}.so" > /etc/httpd/conf.d/10_mpm.conf.rpmnew
                 cat /etc/httpd/conf.d/10_mpm.conf >> /etc/httpd/conf.d/10_mpm.conf.rpmnew
                 mv /etc/httpd/conf.d/10_mpm.conf.rpmnew /etc/httpd/conf.d/10_mpm.conf