#
# Conditional build:
-# mod_rewrite_ldap - enable ldap map supoort for mod_rewrite (alpha)
+# _with_rewrite_ldap - enable ldap map support for mod_rewrite (alpha)
# _without_ipv6 - disable IPv6 support
#
%include /usr/lib/rpm/macros.perl
Summary(uk): îÁÊÐÏÐÕÌÑÒΦÛÉÊ Web-Server
Summary(zh_CN): Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
Name: apache
-Version: 1.3.26
-Release: 5
-License: Apache Group
+Version: 1.3.31
+Release: 1
+License: Apache Group
Group: Networking/Daemons
-URL: http://www.apache.org/
-Source0: ftp://ftp.apache.org/dist/httpd/%{name}_%{version}.tar.gz
-Source1: %{name}.init
+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
Patch19: %{name}-PLD-nov6.patch
Patch20: %{name}-configdir_skip_backups.patch
Patch21: %{name}-apxs-quiet.patch
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+URL: http://www.apache.org/
BuildRequires: db3-devel
BuildRequires: mm-devel >= 1.1.3
-%{?mod_rewrite_ldap:BuildRequires: openldap-devel}
-PreReq: rc-scripts
+%{?_with_rewrite_ldap:BuildRequires: openldap-devel}
PreReq: mm
PreReq: perl
-Requires(pre): sh-utils
-Requires(pre): /usr/bin/getgid
+PreReq: rc-scripts
Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/useradd
Requires(post,preun): /sbin/chkconfig
-Requires(postun): /usr/sbin/userdel
Requires(postun): /usr/sbin/groupdel
-Requires: mailcap
+Requires(postun): /usr/sbin/userdel
Requires: /etc/mime.types
+Requires: mailcap
Requires: psmisc >= 20.1
+Provides: %{name}(EAPI) = %{version}
Provides: httpd
Provides: webserver
-Provides: %{name}(EAPI) = %{version}
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: httpd
Obsoletes: webserver
Obsoletes: apache-extra
Apache serbest daðýtýlan ve çok kullanýlan yetenekli bir web
sunucusudur.
-%description -l uk
-
%description -l zh_CN
Apache Êǹ¦ÄÜÇ¿¾¢ÆëÈ«¡¢¸ßЧÇÒÃâ·ÑÌṩµÄ Web ·þÎñ³ÌÐò£¬ ͬʱҲÊÇ
Internet ÉÏ×îÁ÷ÐÐµÄ Web ·þÎñ³ÌÐò¡£
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
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}
%patch10 -p1
%patch11 -p1
%patch12 -p1
-%{?mod_rewrite_ldap:%patch13 -p1}
+%{?_with_rewrite_ldap:%patch13 -p1}
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch21 -p1
%build
-OPTIM="%{rpmcflags}" \
+OPTIM="%{rpmcflags} -DHARD_SERVER_LIMIT=2048 -DBIG_SECURITY_HOLE=1" \
./configure \
--prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
%{__make} LIBS1="-lm -lcrypt -lmm -ldl"
rm -f src/modules/standard/mod_auth_db.so
-%{__make} -C src/modules/standard mod_auth_db.so LIBS_SHLIB="-ldb"
+%{__make} -C src/modules/standard mod_auth_db.so \
+ LIBS_SHLIB="-ldb"
rm -f src/modules/standard/mod_rewrite.so
-%{__make} -C src/modules/standard mod_rewrite.so LIBS_SHLIB="-ldb %{?mod_rewrite_ldap:-lldap -llber}"
+%{__make} -C src/modules/standard mod_rewrite.so \
+ LIBS_SHLIB="-ldb %{?_with_rewrite_ldap:-lldap -llber}"
%install
rm -rf $RPM_BUILD_ROOT
$RPM_BUILD_ROOT%{_datadir}/errordocs \
$RPM_BUILD_ROOT/var/{log/{httpd,archiv/httpd},run/apache}
-%{__make} install-quiet root="$RPM_BUILD_ROOT"
+%{__make} install-quiet \
+ root="$RPM_BUILD_ROOT"
mv -f $RPM_BUILD_ROOT%{_datadir}/html/manual $RPM_BUILD_ROOT%{_datadir}
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
fi
%post
-if [ $1 = 1 ]; then
- /sbin/chkconfig --add httpd
-fi
+/sbin/chkconfig --add httpd
%{apxs} -e -a -n access %{_libexecdir}/mod_access.so 1>&2
%{apxs} -e -a -n alias %{_libexecdir}/mod_alias.so 1>&2
%{apxs} -e -a -n asis %{_libexecdir}/mod_asis.so 1>&2
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
%{_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
%{_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
%{_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
%lang(ja) %{_datadir}/manual/howto/cgi.html.ja.jis
%{_datadir}/manual/howto/footer.html
%{_datadir}/manual/howto/header.html
+%{_datadir}/manual/howto/htaccess.html
%{_datadir}/manual/howto/ssi.html.html
%{_datadir}/manual/howto/ssi.html.en
%lang(ja) %{_datadir}/manual/howto/ssi.html.ja.jis
%{_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
%{_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
+%{_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
%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
%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
%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
+%{_datadir}/manual/mod/mod_auth.html.html
+%{_datadir}/manual/mod/mod_auth.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_auth.html.ja.jis
%files mod_auth_anon
%defattr(644,root,root,755)
%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
%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