- updated to 1.3.31, updated apxs and ipv6-PLD patches

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index f5a95c0bed3c1a477cfafa457cdb303b9173230d..63a4a04a8b659fd7da63ed3c432d4be8b0cb0390 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -26,27 +26,30 @@ Summary(tr):        Lider WWW taray
 Summary(uk):   îÁÊÐÏÐÕÌÑÒΦÛÉÊ Web-Server
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache
-Version:       1.3.27
-Release:       5
-License:       Apache Group 
+Version:       1.3.31
+Release:       1
+License:       Apache Group
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/%{name}_%{version}.tar.gz
+# Source0-md5: bd548a06ac48dda496b4e613572bb020
 Source1:       %{name}1.init
 Source2:       %{name}.logrotate
 Source3:       %{name}-icons.tar.gz
 Source4:       %{name}.sysconfig
 Source5:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
+# Source5-md5: 74ff6e8d8a7b365b48ed10a52fbeb84e
 Source6:       %{name}-httpd.conf
 Source8:       %{name}-mod_vhost_alias.conf
 Source9:       %{name}-mod_status.conf
 Source10:      %{name}-mod_proxy.conf
 Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-suexec.patch
-Patch2:                %{name}-htdocs.patch
-Patch3:                %{name}-errordocs.patch
-Patch4:                %{name}-apxs.patch
-Patch5:                %{name}-mod_ssl-addon.patch
-Patch6:                %{name}-mod_ssl-eapi.patch
+Patch2:                %{name}-errordocs.patch
+Patch3:                %{name}-apxs.patch
+Patch4:                %{name}-mod_ssl-addon.patch
+Patch5:                %{name}-mod_ssl-eapi.patch
+# http://allafrica.com/tools/apache/mod_proxy/
+Patch6:                http://allafrica.com/tools/apache/mod_proxy/mod_proxy-khk_1.3.26-patch.diff
 Patch7:                %{name}-EAPI_MM_CORE_PATH-correction.patch
 Patch8:                %{name}-EAPI_MM=SYSTEM.patch
 Patch9:                %{name}-ipv6-PLD.patch
@@ -62,7 +65,6 @@ Patch18:      %{name}-EAPI-missing_files.patch
 Patch19:       %{name}-PLD-nov6.patch
 Patch20:       %{name}-configdir_skip_backups.patch
 Patch21:       %{name}-apxs-quiet.patch
-Patch22:       %{name}-security_htdigest_bufferoverflow.patch
 URL:           http://www.apache.org/
 BuildRequires: db3-devel
 BuildRequires: mm-devel >= 1.1.3
@@ -76,11 +78,11 @@ Requires(pre):      /usr/sbin/useradd
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
-Provides:      %{name}(EAPI) = %{version}
 Requires:      /etc/mime.types
-Provides:      httpd
 Requires:      mailcap
 Requires:      psmisc >= 20.1
+Provides:      %{name}(EAPI) = %{version}
+Provides:      httpd
 Provides:      webserver
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     httpd
@@ -311,7 +313,6 @@ Paketet apache-devel inneh
 Summary:       Apache module for run CGI whenever a file of a certain type is requested
 Summary(pl):   Modu³ dla apache do uruchamiania skryptów cgi
 Group:         Networking/Daemons
-Requires(post,preun):  %{_sbindir}/apxs
 Prereq:                %{_sbindir}/apxs
 Prereq:                perl
 Requires:      %{name}(EAPI) = %{version}
@@ -534,11 +535,13 @@ This package contains module with implementation a proxy/cache for
 Apache. It implements proxying capability for FTP, CONNECT (for SSL),
 HTTP/0.9, and HTTP/1.0. The module can be configured to connect to
 other proxy modules for these and other protocols.
+Contains patch from: http://allafrica.com/tools/apache/mod_proxy/
 
 %description mod_proxy -l pl
 Modu³ zawiera implementacjê serwera proxy/cache dla Apache.
 Iplementacja zawiera obs³ugê FTP, CONNECT (dla SSL), HTTP/0.9 i
 HTTP/1.0.
+Zawiera ³atê z: http://allafrica.com/tools/apache/mod_proxy/
 
 %package mod_rewrite
 Summary:       Apache module with rule-based engine for rewrite requested URLs on the fly
@@ -648,15 +651,31 @@ Modu
 wa¿no¶ci mo¿e byæ ustalana w zale¿no¶ci od czasu modyfikacji plików
 ¼ród³owych lub odwo³ania klienta.
 
+%package mod_log_forensic
+Summary:       Apache module for forensic logging of the requests
+Summary:       Modu³ Apache'a do logowania ¿±dañ w celu pó¼niejszej analizy
+Group:         Networking/Daemons
+Prereq:                %{_sbindir}/apxs
+Prereq:                perl
+Requires:      %{name}(EAPI) = %{version}
+
+%description mod_log_forensic
+This module provides for forensic logging of client requests. Logging
+is done before and after processing a request.
+
+%description mod_log_forensic -l pl
+Ten modu³ pozwala na logowanie ¿±dañ w celu pó¼niejszej analizy.
+Logowanie jest wykonywane przed i po przetworzeniu ¿±dania.
+
 %prep
 %setup -q -n apache_%{version} -a3
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+%patch4 -p0
 %patch5 -p0
-%patch6 -p0
+%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %{!?_without_ipv6:%patch9 -p1}
@@ -672,10 +691,9 @@ wa
 %{?_without_ipv6:%patch19 -p1}
 %patch20 -p1
 %patch21 -p1
-%patch22 -p1
 
 %build
-OPTIM="%{rpmcflags} -DHARD_SERVER_LIMIT=2048" \
+OPTIM="%{rpmcflags} -DHARD_SERVER_LIMIT=2048 -DBIG_SECURITY_HOLE=1" \
 ./configure \
        --prefix=%{_prefix} \
        --sysconfdir=%{_sysconfdir} \
@@ -734,9 +752,8 @@ touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer}_log
 install errordocs/* $RPM_BUILD_ROOT%{_datadir}/errordocs
 
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-
-install %{SOURCE8}  $RPM_BUILD_ROOT%{_sysconfdir}/mod_vhost_alias.conf
-install %{SOURCE9}  $RPM_BUILD_ROOT%{_sysconfdir}/mod_status.conf
+install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/mod_vhost_alias.conf
+install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mod_status.conf
 install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/mod_proxy.conf
 
 ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html
@@ -1035,6 +1052,22 @@ if [ "$1" = "0" ]; then
        fi
 fi
 
+%post mod_log_forensic
+%{apxs} -e -a -n log_forensic %{_libexecdir}/mod_log_forensic.so 1>&2
+if [ -f /var/lock/subsys/httpd ]; then
+       /etc/rc.d/init.d/httpd restart 1>&2
+else
+       echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+fi
+
+%preun mod_log_forensic
+if [ "$1" = "0" ]; then
+       %{apxs} -e -A -n log_forensic %{_libexecdir}/mod_log_forensic.so 1>&2
+       if [ -f /var/lock/subsys/httpd ]; then
+               /etc/rc.d/init.d/httpd restart 1>&2
+       fi
+fi
+
 %post mod_proxy
 %{apxs} -e -a -n proxy %{_libexecdir}/libproxy.so 1>&2
 if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_proxy.conf" /etc/httpd/httpd.conf; then
@@ -1214,8 +1247,6 @@ fi
 %{_datadir}/manual/images/pixel.gif
 %{_datadir}/manual/images/sub.gif
 %{_datadir}/manual/misc
-%dir %{_datadir}/manual/search
-%attr(755,root,root) %{_datadir}/manual/search/manual-index.cgi
 %{_datadir}/manual/LICENSE
 %{_datadir}/manual/bind.html.html
 %{_datadir}/manual/bind.html.en
@@ -1229,7 +1260,9 @@ fi
 %{_datadir}/manual/configuring.html.en
 %lang(fr) %{_datadir}/manual/configuring.html.fr
 %lang(ja) %{_datadir}/manual/configuring.html.ja.jis
-%{_datadir}/manual/content-negotiation.html
+%{_datadir}/manual/content-negotiation.html.html
+%{_datadir}/manual/content-negotiation.html.en
+%lang(ja) %{_datadir}/manual/content-negotiation.html.ja.jis
 %{_datadir}/manual/custom-error.html.html
 %{_datadir}/manual/custom-error.html.en
 %lang(fr) %{_datadir}/manual/custom-error.html.fr
@@ -1261,7 +1294,9 @@ fi
 %{_datadir}/manual/keepalive.html.html
 %{_datadir}/manual/keepalive.html.en
 %lang(ja) %{_datadir}/manual/keepalive.html.ja.jis
-%{_datadir}/manual/location.html
+%{_datadir}/manual/location.html.html
+%{_datadir}/manual/location.html.en
+%lang(ja) %{_datadir}/manual/location.html.ja.jis
 %{_datadir}/manual/logs.html
 %{_datadir}/manual/multilogs.html
 %{_datadir}/manual/new_features_1_3.html.html
@@ -1298,6 +1333,7 @@ fi
 %{_datadir}/manual/mod/core.html.html
 %{_datadir}/manual/mod/core.html.en
 %lang(fr) %{_datadir}/manual/mod/core.html.fr
+%lang(ja) %{_datadir}/manual/mod/core.html.ja.jis
 %{_datadir}/manual/mod/directive-dict.html.html
 %{_datadir}/manual/mod/directive-dict.html.en
 %lang(fr) %{_datadir}/manual/mod/directive-dict.html.fr
@@ -1320,12 +1356,15 @@ fi
 %{_datadir}/manual/mod/mod_access.html.html
 %{_datadir}/manual/mod/mod_access.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_access.html.ja.jis
+%{_datadir}/manual/mod/mod_alias.html.html
 %{_datadir}/manual/mod/mod_alias.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_alias.html.ja.jis
 %{_datadir}/manual/mod/mod_asis.html.html
 %{_datadir}/manual/mod/mod_asis.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_asis.html.ja.jis
-%{_datadir}/manual/mod/mod_autoindex.html
+%{_datadir}/manual/mod/mod_autoindex.html.html
+%{_datadir}/manual/mod/mod_autoindex.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_autoindex.html.ja.jis
 %{_datadir}/manual/mod/mod_cern_meta.html
 %{_datadir}/manual/mod/mod_cgi.html.html
 %{_datadir}/manual/mod/mod_cgi.html.en
@@ -1335,7 +1374,9 @@ fi
 %lang(ja) %{_datadir}/manual/mod/mod_env.html.ja.jis
 %{_datadir}/manual/mod/mod_include.html
 %{_datadir}/manual/mod/mod_log_agent.html
-%{_datadir}/manual/mod/mod_log_config.html
+%{_datadir}/manual/mod/mod_log_config.html.html
+%{_datadir}/manual/mod/mod_log_config.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_log_config.html.ja.jis
 %{_datadir}/manual/mod/mod_log_referer.html
 %{_datadir}/manual/mod/mod_mime.html.html
 %{_datadir}/manual/mod/mod_mime.html.en
@@ -1432,7 +1473,7 @@ fi
 %lang(ru) %{_datadir}/html/index.html.ru.ucs4
 %lang(ru) %{_datadir}/html/index.html.ru.utf8
 %lang(sv) %{_datadir}/html/index.html.se
-%lang(zh_TW) %{_datadir}/html/index.html.zh
+%lang(zh_TW) %{_datadir}/html/index.html.zh-tw.big5
 
 %{_datadir}/html/*.gif
 %{_datadir}/errordocs
@@ -1470,6 +1511,7 @@ fi
 %attr(755,root,root) %{_libexecdir}/mod_auth.so
 %attr(755,root,root) %{_bindir}/htpasswd
 %{_datadir}/manual/howto/auth.html
+%{_datadir}/manual/mod/mod_auth.html.html
 %{_datadir}/manual/mod/mod_auth.html.en
 %lang(ja) %{_datadir}/manual/mod/mod_auth.html.ja.jis
 
@@ -1523,6 +1565,12 @@ fi
 %attr(755,root,root) %{_libexecdir}/mod_mmap_static.so
 %{_datadir}/manual/mod/mod_mmap_static.html
 
+%files mod_log_forensic
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/mod_log_forensic.so
+%{_datadir}/manual/mod/mod_log_forensic.html.html
+%{_datadir}/manual/mod/mod_log_forensic.html.en
+
 %files mod_imap
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_imap.so
@@ -1545,7 +1593,9 @@ fi
 %files mod_rewrite
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_rewrite.so
-%{_datadir}/manual/mod/mod_rewrite.html
+%{_datadir}/manual/mod/mod_rewrite.html.html
+%{_datadir}/manual/mod/mod_rewrite.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_rewrite.html.ja.jis
 %{_datadir}/manual/images/mod_rewrite*
 
 %files mod_status