- rel 8; fix graceful restart for keepalive connections

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index e762c65b72a807872d9934aa3ae3ce5dd23512bc..3de6d9b2a15c048d6ab485af162b51d39e729ceb 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -21,8 +21,7 @@
 %bcond_without event           # event MPM
 %bcond_with    distcache       # distcache support
 %bcond_with    bucketeer       # debug one
-#
-%include       /usr/lib/rpm/macros.perl
+
 # this is internal macro, don't change to %%apache_modules_api
 %define                _apache_modules_api 20051115
 
@@ -31,6 +30,7 @@
 %else
 %define                openssl_ver     0.9.7d
 %endif
+%include       /usr/lib/rpm/macros.perl
 Summary:       The most widely used Web server on the Internet
 Summary(de.UTF-8):     Leading World Wide Web-Server
 Summary(es.UTF-8):     Servidor HTTPD para proveer servicios WWW
@@ -40,12 +40,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.15
-Release:       2
+Version:       2.2.17
+Release:       8
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: 31fa022dc3c0908c6eaafe73c81c65df
+# Source0-md5: 66d8e107f85acc039fd5e624e85728a9
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -86,7 +86,6 @@ Patch7:               %{name}-syslibs.patch
 Patch8:                httpd-2.0.45-encode.patch
 Patch9:                %{name}-paths.patch
 Patch10:       httpd-2.0.46-dav401dest.patch
-Patch11:       %{name}-bug-40970.patch
 Patch12:       httpd-2.0.46-sslmutex.patch
 Patch14:       httpd-2.0.48-corelimit.patch
 Patch15:       httpd-2.0.48-debuglog.patch
@@ -97,6 +96,8 @@ Patch23:      %{name}-suexec_fcgi.patch
 Patch24:       %{name}-bug-48094.patch
 # http://scripts.mit.edu/trac/browser/trunk/server/common/patches/httpd-2.2.x-mod_ssl-sessioncaching.patch?rev=1348
 Patch25:       httpd-2.2.x-mod_ssl-sessioncaching.patch
+Patch26:       apache-mod_vhost_alias_docroot.patch
+Patch27:       apache-bug-41743.patch
 URL:           http://httpd.apache.org/
 BuildRequires: apr-devel >= 1:1.2
 BuildRequires: apr-util-devel >= 1:1.3
@@ -108,8 +109,8 @@ BuildRequires:      expat-devel
 BuildRequires: gdbm-devel >= 1.8.3
 BuildRequires: libtool >= 2:1.5
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
-%{?with_ssl:BuildRequires:     openssl-devel >= %{openssl_version}}
-%{?with_ssl:BuildRequires:     openssl-tools >= %{openssl_version}}
+%{?with_ssl:BuildRequires:     openssl-devel >= %{openssl_ver}}
+%{?with_ssl:BuildRequires:     openssl-tools >= %{openssl_ver}}
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig
 BuildRequires: rpm >= 4.4.9-56
@@ -818,20 +819,33 @@ proxy. Dołączono dwa moduły pozwalające magazynować dane w pamięci
 dysku (używane do cache'owania proxy).
 
 %package mod_case_filter
-Summary:       TODO
+Summary:       Apache output filter that converts all output to upper case
+Summary(pl.UTF-8):     Filtr wyjściowy Apache'a zamieniający wszystkie litery na wielkie
 Group:         Networking/Daemons/HTTP
 Requires:      %{name}-base = %{version}-%{release}
 Provides:      apache(mod_case_filter) = %{version}-%{release}
 
 %description mod_case_filter
+Apache output filter that converts all output to upper case.
+
+%description mod_case_filter -l pl.UTF-8
+Filtr wyjściowy Apache'a zamieniający wszystkie litery w wyjściu na
+wielkie.
 
 %package mod_case_filter_in
-Summary:       TODO
+Summary:       Apache input filter that converts all request body to upper case
+Summary(pl.UTF-8):     Filtr wejściowy Apache'a zamieniający wszystkie litery w żądaniu na wielkie
 Group:         Networking/Daemons/HTTP
 Requires:      %{name}-base = %{version}-%{release}
 Provides:      apache(mod_case_filter_in) = %{version}-%{release}
 
 %description mod_case_filter_in
+Apache input filter that converts all request body (not headers) to
+upper case.
+
+%description mod_case_filter_in -l pl.UTF-8
+Filtr wejściowy Apache'a zamieniający wszystkie litery w ciele żądania
+(ale nie nagłówkach) na wielkie.
 
 %package mod_cern_meta
 Summary:       CERN httpd metafile semantics
@@ -954,6 +968,7 @@ URL:                http://httpd.apache.org/docs/2.2/en/mod/mod_dav.html
 Requires:      %{name}-base = %{version}-%{release}
 Requires:      apache-mod_authn_file
 Requires:      apache-mod_setenvif
+Requires:      apr-util-dbm-db
 Provides:      apache(mod_dav) = %{version}-%{release}
 
 %description mod_dav
@@ -1466,7 +1481,7 @@ HTTP/1.0 i HTTP/1.1.
 
 %package mod_reqtimeout
 Summary:       Apache module to set timeout and minimum data rate for receiving requests
-Summary(pl.UTF-8):     Moduł Apache'a pozwalający na ustawianie timeout oraz minimalnego transferu danych
+Summary(pl.UTF-8):     Moduł Apache'a pozwalający na ustawianie limitu czasu oraz minimalnego transferu danych
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.2/mod/mod_reqtimeout.html
 Requires:      %{name}-base = %{version}-%{release}
@@ -1478,7 +1493,7 @@ Apache module to set timeout and minimum data rate for receiving
 requests.
 
 %description mod_reqtimeout -l pl.UTF-8
-Moduł Apache'a pozwalający na ustawianie timeout oraz minimalnego
+Moduł Apache'a pozwalający na ustawianie limitu czasu oraz minimalnego
 transferu danych.
 
 %package mod_rewrite
@@ -1555,7 +1570,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_version}
+Requires:      openssl >= %{openssl_ver}
 %if "%{pld_release}" != "ac"
 Requires:      apr-util-dbm-db
 %endif
@@ -1762,7 +1777,6 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 %patch12 -p1
 %patch14 -p1
 %patch15 -p1
@@ -1772,6 +1786,8 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
+%patch27 -p0
 
 # using system apr, apr-util and pcre
 rm -rf srclib/{apr,apr-util,pcre}