- rotate combined_log too!!

[packages/apache1.git] / apache1.spec

diff --git a/apache1.spec b/apache1.spec
index 1fbde00d9d13405a7b7a80a460934cc0c628702b..acc25acdec97cad6bde7410bd0ccbd4750a8b0d9 100644 (file)
--- a/apache1.spec
+++ b/apache1.spec
@@ -1,3 +1,4 @@
+#
 # Conditional build:
 %bcond_with    rewrite_ldap    # enable ldap map support for mod_rewrite (alpha)
 %bcond_without ipv6            # disable IPv6 support
@@ -27,12 +28,12 @@ Summary(tr):        Lider WWW taray
 Summary(uk):   îÁÊÐÏÐÕÌÑÒΦÛÉÊ Web-Server
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache1
-Version:       1.3.34
-Release:       9
+Version:       1.3.36
+Release:       1.5
 License:       Apache Group
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
-# Source0-md5: 9978cc552b423f0015c1052d23ab619e
+# Source0-md5: d6c0709fc1f20d6d93d30435fcfc4843
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       apache-icons.tar.gz
@@ -86,9 +87,25 @@ Patch20:     %{name}-configdir_skip_backups.patch
 Patch21:       %{name}-apxs-quiet.patch
 Patch22:       %{name}-db4.patch
 Patch23:       %{name}-less-libs.patch
-Patch24:       %{name}-CVE-2005-3352.patch
-Patch25:       %{name}-rwrite-debug.patch
-Patch26:       %{name}-apxs-DESTDIR.patch
+Patch24:       %{name}-rwrite-debug.patch
+Patch25:       %{name}-apxs-DESTDIR.patch
+# from debian apache_1.3.34-2.diff.gz
+Patch26:       %{name}-regex_must_conform_to_posix_for_LFS_to_work.patch
+Patch27:       %{name}-suexec_of_death.patch
+Patch28:       %{name}-suexec_reopenlog.patch
+Patch29:       %{name}-autoindex_studly.patch
+Patch30:       %{name}-autoindex_indexes.patch
+Patch31:       %{name}-autoindex_generator.patch
+Patch32:       %{name}-ab.8_formatting_error.patch
+Patch33:       %{name}-proxy_content_base.patch
+Patch34:       %{name}-inetdfix.patch
+Patch35:       %{name}-configure_hashbang.patch
+Patch36:       %{name}-log_files_permission.patch
+Patch37:       %{name}-htpasswd_do_not_trash_extra_fields.patch
+Patch38:       %{name}-GNU_xargs.patch
+Patch39:       %{name}-security_htdigest_local_buffer_overflow.patch
+Patch40:       %{name}-security_htpasswd_user_buffer_overflow.patch
+Patch41:       %{name}-security_check_forensic_tempfiles.patch
 URL:           http://httpd.apache.org/
 BuildRequires: db-devel >= 4.1
 BuildRequires: mm-devel >= 1.3.0
@@ -97,7 +114,6 @@ BuildRequires:       perl-base
 BuildRequires: rpm-build >= 4.4.0
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.268
-Requires:      mm
 Requires:      rc-scripts
 %if %{without minimal}
 # essental modules (maybe remove these in future if all Requires in
@@ -427,6 +443,7 @@ Summary(pl):        Kontrola dost
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Provides:      apache(mod_access) = %{version}-%{release}
+Provides:      webserver(access)
 
 %description mod_access
 The directives provided by mod_access are used in <Directory>,
@@ -474,6 +491,7 @@ Summary(pl):        Odwzorowywanie cz
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Provides:      apache(mod_alias) = %{version}-%{release}
+Provides:      webserver(alias)
 
 %description mod_alias
 This module provides for mapping different parts of the host
@@ -548,6 +566,7 @@ Group:              Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Requires:      htpasswd
 Provides:      apache(mod_auth) = %{version}-%{release}
+Provides:      webserver(auth)
 Obsoletes:     apache-mod_auth < 2.0.0
 
 %description mod_auth
@@ -670,6 +689,7 @@ Summary(pl):        Wywo
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Provides:      apache(mod_cgi) = %{version}-%{release}
+Provides:      webserver(cgi)
 
 %description mod_cgi
 Any file that has the MIME type application/x-httpd-cgi or handler
@@ -738,6 +758,7 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Provides:      apache(mod_dir) = %{version}-%{release}
+Provides:      webserver(indexfile)
 Obsoletes:     apache-mod_dir < 2.0.0
 
 %description mod_dir
@@ -1265,9 +1286,25 @@ algorytmami CRYPT (domy
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
-%patch24 -p0
+%patch24 -p1
 %patch25 -p1
-%patch26 -p1
+
+%patch26 -p2
+%patch27 -p2
+%patch28 -p2
+%patch29 -p2
+%patch30 -p2
+%patch31 -p2
+%patch32 -p2
+%patch33 -p2
+%patch34 -p2
+%patch35 -p2
+%patch36 -p2
+%patch37 -p2
+%patch38 -p2
+%patch39 -p2
+%patch40 -p2
+%patch41 -p2
 
 %if %{with lingerd}
 mv lingerd-* _lingerd
@@ -1407,8 +1444,8 @@ perl -p -i -e 's/^if ...O ne "MSWin32"./if (0)/' $RPM_BUILD_ROOT%{apxs}
 
 mv $RPM_BUILD_ROOT%{_sysconfdir}/modules/* $RPM_BUILD_ROOT%{_libexecdir}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/modules
-ln -s %{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules
-ln -s /var/log/apache $RPM_BUILD_ROOT%{_sysconfdir}/logs
+ln -s ../..%{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules
+ln -s ../../var/log/apache $RPM_BUILD_ROOT%{_sysconfdir}/logs
 
 ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}