Author: glen Date: Wed Feb 6 19:36:03 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- HEAD merge:
- never use '<=' in trigger comparision
- updated init script (added try-restart action)
- dropped unused apache-icons.tar.gz (4 inconsistent icons with unclear origin and license)
- rel 2
---- Files affected:
SPECS:
apache.spec (1.498.2.10 -> 1.498.2.11)
---- Diffs:
================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.498.2.10 SPECS/apache.spec:1.498.2.11
--- SPECS/apache.spec:1.498.2.10 Wed Jan 23 12:16:37 2008
+++ SPECS/apache.spec Wed Feb 6 20:35:58 2008
@@ -1,7 +1,6 @@
# $Revision$, $Date$
# TODO:
# - config examples for mod_*
-# - --with-suexec-gidmin=500 or =100 ?
# - --with-suexec-uidmin=500 or =1000 ?
# - subpackages for MPMs
# - !!!check if all modules (*.so) are exactly the same for different MPMs
@@ -20,7 +19,7 @@
%bcond_without metuxmpm # metux MPM
%bcond_without peruser # peruser MPM
%bcond_without event # event MPM
-%bcond_with distcache # distcache support
+%bcond_with distcache # distcache support
%bcond_with bucketeer # debug one
#
%include /usr/lib/rpm/macros.perl
@@ -36,16 +35,16 @@
Summary(tr.UTF-8): Lider WWW tarayıcı
Name: apache
Version: 2.2.8
-Release: 1
+Release: 2
License: Apache Group License
Group: Networking/Daemons
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
# Source0-md5: 39a755eb0f584c279336387b321e3dfc
Source1: %{name}.init
Source2: %{name}.logrotate
-Source3: %{name}-icons.tar.gz
-# Source3-md5: 2b085cbc19fd28536dc883f0b864cd83
-Source4: %{name}.sysconfig
+Source3: %{name}.sysconfig
+Source4: %{name}-server.crt
+Source5: %{name}-server.key
Source6: %{name}-httpd.conf
Source7: %{name}-common.conf
Source8: %{name}-mod_vhost_alias.conf
@@ -60,17 +59,15 @@
Source17: %{name}-mod_autoindex.conf
Source18: %{name}-multilang-errordoc.conf
Source19: %{name}-manual.conf
-Source20: %{name}-server.crt
-Source21: %{name}-server.key
-Source22: %{name}-mod_userdir.conf
-Source23: %{name}-mpm.conf
-Source24: %{name}-languages.conf
-Source25: %{name}-mod_mime.conf
-Source27: %{name}-mod_authz_host.conf
-Source28: %{name}-mod_cgid.conf
-Source29: %{name}-mod_log_config.conf
-Source30: %{name}-mod_mime_magic.conf
-Source31: %{name}-mod_cache.conf
+Source20: %{name}-mod_userdir.conf
+Source21: %{name}-mpm.conf
+Source22: %{name}-languages.conf
+Source23: %{name}-mod_mime.conf
+Source24: %{name}-mod_authz_host.conf
+Source25: %{name}-mod_cgid.conf
+Source26: %{name}-mod_log_config.conf
+Source27: %{name}-mod_mime_magic.conf
+Source28: %{name}-mod_cache.conf
Patch0: %{name}-configdir_skip_backups.patch
Patch1: %{name}-layout.patch
Patch2: %{name}-suexec.patch
@@ -1890,14 +1887,14 @@
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/httpd
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/httpd
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/httpd
touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer,suexec}_log
%if %{with ssl}
install -d $RPM_BUILD_ROOT%{_sysconfdir}/ssl
-install %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.crt
-install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.key
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.crt
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.key
%endif
install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -1906,12 +1903,12 @@
install %{SOURCE7} $CFG/10_common.conf
-install %{SOURCE25} $CFG/01_mod_mime.conf
-install %{SOURCE27} $CFG/01_mod_authz_host.conf
-install %{SOURCE28} $CFG/01_mod_cgid.conf
-install %{SOURCE29} $CFG/01_mod_log_config.conf
-install %{SOURCE30} $CFG/01_mod_mime_magic.conf
-install %{SOURCE31} $CFG/01_mod_cache.conf
+install %{SOURCE23} $CFG/01_mod_mime.conf
+install %{SOURCE24} $CFG/01_mod_authz_host.conf
+install %{SOURCE25} $CFG/01_mod_cgid.conf
+install %{SOURCE26} $CFG/01_mod_log_config.conf
+install %{SOURCE27} $CFG/01_mod_mime_magic.conf
+install %{SOURCE28} $CFG/01_mod_cache.conf
install %{SOURCE8} $CFG/20_mod_vhost_alias.conf
install %{SOURCE9} $CFG/25_mod_status.conf
install %{SOURCE10} $CFG/30_mod_proxy.conf
@@ -1924,9 +1921,9 @@
install %{SOURCE17} $CFG/57_mod_autoindex.conf
install %{SOURCE18} $CFG/30_errordocs.conf
install %{SOURCE19} $CFG/30_manual.conf
-install %{SOURCE22} $CFG/16_mod_userdir.conf
-install %{SOURCE23} $CFG/10_mpm.conf
-install %{SOURCE24} $CFG/20_languages.conf
+install %{SOURCE20} $CFG/16_mod_userdir.conf
+install %{SOURCE21} $CFG/10_mpm.conf
+install %{SOURCE22} $CFG/20_languages.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
@@ -1975,7 +1972,7 @@
echo "LoadModule rewrite_module modules/mod_rewrite.so" > $CFG/00_mod_rewrite.conf
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_subsitute.so" > $CFG/00_mod_substitute.conf
+echo "LoadModule substitute_module modules/mod_subsitute.so" > $CFG/00_mod_substitute.conf
# anything in style dir not ending with .css is trash
rm -rf $RPM_BUILD_ROOT%{_datadir}/manual/style/{lang,latex,xsl}
@@ -2054,7 +2051,7 @@
%groupremove http
fi
-%triggerpostun base -- %{name} <= 2.0.50-6
+%triggerpostun base -- %{name} < 2.0.50-6.9
%banner %{name}-2.0.50-6 << EOF
WARNING!!!
Since apache-2.0.50-6 autoindex module has been separated to package
@@ -2715,6 +2712,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.498.2.11 2008-02-06 19:35:58 glen
+- HEAD merge:
+ - never use '<=' in trigger comparision
+ - updated init script (added try-restart action)
+ - dropped unused apache-icons.tar.gz (4 inconsistent icons with unclear origin and license)
+ - rel 2
+
Revision 1.498.2.10 2008-01-23 11:16:37 glen
- merge update to 2.2.8 from HEAD
fixes CVE-2007-6421, CVE-2007-6422, CVE-2007-6388, CVE-2007-5000, CVE-2008-0005 + bunch of other non-secutify bugs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache.spec?r1=1.498.2.10&r2=1.498.2.11&f=u