- up to 2.2.26

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 66905c1e385e4e13777c3c65875f53adf1e433d7..43346d9cb17d69bde528ccc4481367004a2b9837 100644 (file)
--- 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
-Release:       4
+Version:       2.2.26
+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: 8f580ea4f8476d5fb131b772beca33b2
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -94,6 +94,7 @@ 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
@@ -108,6 +109,7 @@ Patch26:    apache-mod_vhost_alias_docroot.patch
 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
@@ -1791,6 +1793,7 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch10 -p1
 %patch12 -p1
 %patch11 -p1
+%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch18 -p1
@@ -1800,9 +1803,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}