X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache.spec;h=1c34b578c5b14b51ccacbb10fffd4025a7c97086;hb=9007ead821a5c35774b1444e130d7ff74186bbf4;hp=648042b4558008e3eace4af875beb0882861dfa2;hpb=7ebffa14b179322aa16bbd7a1ae9779c3e28bb7c;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index 648042b..1c34b57 100644
--- a/apache.spec
+++ b/apache.spec
@@ -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.14
-Release:	10
+Version:	2.2.17
+Release:	3
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5:	2c1e3c7ba00bcaa0163da7b3e66aaa1e
+# Source0-md5:	66d8e107f85acc039fd5e624e85728a9
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -74,6 +74,7 @@ Source25:	%{name}-mod_cgid.conf
 Source26:	%{name}-mod_log_config.conf
 Source27:	%{name}-mod_mime_magic.conf
 Source28:	%{name}-mod_cache.conf
+Source29:	%{name}-example.net.conf
 Patch0:		%{name}-configdir_skip_backups.patch
 Patch1:		%{name}-layout.patch
 Patch2:		%{name}-suexec.patch
@@ -85,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
@@ -94,8 +94,9 @@ Patch19:	%{name}-conffile-path.patch
 Patch20:	%{name}-apxs.patch
 Patch23:	%{name}-suexec_fcgi.patch
 Patch24:	%{name}-bug-48094.patch
-# http://marc.info/?l=apache-httpd-dev&m=125712658610440&w=2
-Patch25:	%{name}-shutdown-sockets.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
 URL:		http://httpd.apache.org/
 BuildRequires:	apr-devel >= 1:1.2
 BuildRequires:	apr-util-devel >= 1:1.3
@@ -110,6 +111,7 @@ BuildRequires:	libtool >= 2:1.5
 %{?with_ssl:BuildRequires:	openssl-devel >= %{openssl_version}}
 %{?with_ssl:BuildRequires:	openssl-tools >= %{openssl_version}}
 BuildRequires:	pcre-devel
+BuildRequires:	pkgconfig
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-build >= 4.4.0
 BuildRequires:	rpm-perlprov >= 4.1-13
@@ -816,20 +818,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
@@ -952,6 +967,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
@@ -1462,6 +1478,23 @@ Moduł zawiera implementację serwera proxy/cache dla Apache.
 Implementacja zawiera obsługę FTP, CONNECT (dla SSL), HTTP/0.9,
 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 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}
+Provides:	apache(mod_reqtimeout) = %{version}-%{release}
+Provides:	webserver(reqtimeout)
+
+%description mod_reqtimeout
+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 limitu czasu oraz minimalnego
+transferu danych.
+
 %package mod_rewrite
 Summary:	Apache module with rule-based engine for rewrite requested URLs on the fly
 Summary(pl.UTF-8):	Moduł Apache'a do "przepisywania" adresów URL w locie
@@ -1743,7 +1776,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
@@ -1753,6 +1785,7 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
 
 # using system apr, apr-util and pcre
 rm -rf srclib/{apr,apr-util,pcre}
@@ -1883,7 +1916,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
 	$RPM_BUILD_ROOT%{_var}/{log/{httpd,archive/httpd},{run,cache}/httpd,lock/mod_dav} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \
-	$RPM_BUILD_ROOT%{_datadir}/cgi-bin
+	$RPM_BUILD_ROOT%{_datadir}/{cgi-bin,vhosts}
 
 # prefork is default one
 %{__make} -C buildmpm-prefork install \
@@ -1938,6 +1971,7 @@ cp -a %{SOURCE19} $CFG/30_manual.conf
 cp -a %{SOURCE20} $CFG/16_mod_userdir.conf
 cp -a %{SOURCE21} $CFG/10_mpm.conf
 cp -a %{SOURCE22} $CFG/20_languages.conf
+cp -a %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf
 
 echo "LoadModule alias_module modules/mod_alias.so" > $CFG/00_mod_alias.conf
 echo "LoadModule authn_file_module	modules/mod_authn_file.so" > $CFG/00_mod_authn_file.conf
@@ -1987,6 +2021,7 @@ echo "LoadModule rewrite_module	modules/mod_rewrite.so" > $CFG/00_mod_rewrite.co
 echo "LoadModule usertrack_module	modules/mod_usertrack.so" > $CFG/00_mod_usertrack.conf
 echo "LoadModule unique_id_module	modules/mod_unique_id.so" > $CFG/00_mod_unique_id.conf
 echo "LoadModule substitute_module	modules/mod_substitute.so" > $CFG/00_mod_substitute.conf
+echo "LoadModule reqtimeout_module	modules/mod_reqtimeout.so" >> $CFG/00_mod_reqtimeout.conf
 
 # anything in style dir not ending with .css is trash
 rm -rf $RPM_BUILD_ROOT%{_datadir}/manual/style/{lang,latex,xsl}
@@ -2250,6 +2285,7 @@ fi
 %module_scripts mod_mime_magic
 %module_scripts mod_negotiation
 %module_scripts mod_proxy
+%module_scripts mod_reqtimeout
 %module_scripts mod_rewrite
 %module_scripts mod_setenvif
 %module_scripts mod_speling
@@ -2302,6 +2338,7 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_common.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mpm.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vhosts.d/example.net.conf
 %attr(640,root,root) %{_sysconfdir}/magic
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/httpd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
@@ -2325,6 +2362,8 @@ fi
 
 %dir %{_datadir}/cgi-bin
 %dir %{_datadir}/html
+%dir %{_datadir}/vhosts
+# do not adapter here, %{_datadir} != /usr/share here
 %{_datadir}/icons
 
 %files doc -f manual.files
@@ -2646,6 +2685,11 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_proxy.conf
 %attr(755,root,root) %{_libexecdir}/mod_proxy*.so
 
+%files mod_reqtimeout
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/mod_reqtimeout.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_reqtimeout.conf
+
 %files mod_rewrite
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/httxt2dbm