X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache.spec;h=a280dd729230b3f9659b1a62ea0b43de88609364;hb=b394bcfd2936143cd98a7913d284c7b8ab75e017;hp=ad932b3910170a56c782e30a03562c089c7072b2;hpb=61889e412c27de1df39cacf09fbd8c125bed8929;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index ad932b3..a280dd7 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.24
+Version:	2.2.32
 Release:	1
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5:	64a3392018ad60583209a16d728180d3
+# Source0-md5:	8141657cf0c58f14de2a5ce9426df2bc
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -92,7 +92,9 @@ 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
@@ -106,6 +108,8 @@ Patch26:	apache-mod_vhost_alias_docroot.patch
 # http://mpm-itk.sesse.net/
 Patch28:	apache-mpm-itk.patch
 Patch29:	libtool-tag.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
@@ -1494,7 +1500,6 @@ Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_reqtimeout.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_reqtimeout) = %{version}-%{release}
-Provides:	webserver(reqtimeout)
 
 %description mod_reqtimeout
 Apache module to set timeout and minimum data rate for receiving
@@ -1578,7 +1583,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_ge_to openssl openssl-devel
 %if "%{pld_release}" != "ac"
 Requires:	apr-util-dbm-db
 %endif
@@ -1788,6 +1793,8 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch9 -p1
 %patch10 -p1
 %patch12 -p1
+%patch11 -p1
+%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch18 -p1
@@ -1797,8 +1804,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}