- use apache1.init instead of ancient old one. This one is developed for

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 2d8e7e2febf14d63299c81cdc54d124dc7a6e0b2..f5a95c0bed3c1a477cfafa457cdb303b9173230d 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -1,6 +1,6 @@
 #
 # 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
@@ -26,13 +26,12 @@ Summary(tr):        Lider WWW taray
 Summary(uk):   îÁÊÐÏÐÕÌÑÒΦÛÉÊ Web-Server
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache
-Version:       1.3.26
+Version:       1.3.27
 Release:       5
 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
+Source1:       %{name}1.init
 Source2:       %{name}.logrotate
 Source3:       %{name}-icons.tar.gz
 Source4:       %{name}.sysconfig
@@ -63,26 +62,27 @@ Patch18:    %{name}-EAPI-missing_files.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)
+Patch22:       %{name}-security_htdigest_bufferoverflow.patch
+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
+Provides:      %{name}(EAPI) = %{version}
 Requires:      /etc/mime.types
-Requires:      psmisc >= 20.1
 Provides:      httpd
+Requires:      mailcap
+Requires:      psmisc >= 20.1
 Provides:      webserver
-Provides:      %{name}(EAPI) = %{version}
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     httpd
 Obsoletes:     webserver
 Obsoletes:     apache-extra
@@ -182,8 +182,6 @@ webbserver. Apache 
 Apache serbest daðýtýlan ve çok kullanýlan yetenekli bir web
 sunucusudur.
 
-%description -l uk
-
 %description -l zh_CN
 Apache Êǹ¦ÄÜÇ¿¾¢ÆëÈ«¡¢¸ßЧÇÒÃâ·ÑÌṩµÄ Web ·þÎñ³ÌÐò£¬ ͬʱҲÊÇ
 Internet ÉÏ×îÁ÷ÐÐµÄ Web ·þÎñ³ÌÐò¡£
@@ -313,6 +311,7 @@ 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}
@@ -664,7 +663,7 @@ wa
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%{?mod_rewrite_ldap:%patch13 -p1}
+%{?_with_rewrite_ldap:%patch13 -p1}
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
@@ -673,9 +672,10 @@ wa
 %{?_without_ipv6:%patch19 -p1}
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %build
-OPTIM="%{rpmcflags}" \
+OPTIM="%{rpmcflags} -DHARD_SERVER_LIMIT=2048" \
 ./configure \
        --prefix=%{_prefix} \
        --sysconfdir=%{_sysconfdir} \
@@ -706,10 +706,12 @@ OPTIM="%{rpmcflags}" \
 %{__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
@@ -717,7 +719,8 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
        $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}
 
@@ -762,9 +765,7 @@ else
 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
@@ -1289,6 +1290,7 @@ fi
 %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
@@ -1318,7 +1320,8 @@ 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
+%{_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
@@ -1467,7 +1470,8 @@ 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
+%{_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)