SPECS (AC-branch): apache.spec - merge update to 2.2.8 from HEAD ...

[glen]

Author: glen                         Date: Wed Jan 23 11:16:42 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 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
- one more CVE to info about 2.2.6 release

---- Files affected:
SPECS:
   apache.spec (1.498.2.9 -> 1.498.2.10) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.498.2.9 SPECS/apache.spec:1.498.2.10
--- SPECS/apache.spec:1.498.2.9	Sun Dec  9 11:35:37 2007
+++ SPECS/apache.spec	Wed Jan 23 12:16:37 2008
@@ -35,12 +35,12 @@
 Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
-Version:	2.2.6
-Release:	3
+Version:	2.2.8
+Release:	1
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5:	d050a49bd7532ec21c6bb593b3473a5d
+# Source0-md5:	39a755eb0f584c279336387b321e3dfc
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}-icons.tar.gz
@@ -309,9 +309,9 @@
 Summary(pt_BR.UTF-8):	Arquivos de inclusão do Apache para desenvolvimento de módulos
 Summary(ru.UTF-8):	Средства разработки модулей для веб-сервера Apache
 Group:		Networking/Utilities
-Obsoletes:	%{name}-apxs
 Requires:	apr-util-devel >= 1:1.2
 Requires:	libtool
+Obsoletes:	apache-apxs
 Obsoletes:	apache-static
 
 %description devel
@@ -1565,6 +1565,22 @@
 Moduł pozwala administratorowi na przeglądanie statystyk dotyczących
 pracy serwera Apache (w postaci strony HTML).
 
+%package mod_substitute
+Summary:	Substitute module for Apache
+Summary(pl.UTF-8):	Moduł pozwalający na znajdywanie i zastępowanie wyjścia dla serwera Apache
+Group:		Networking/Daemons
+URL:		http://httpd.apache.org/docs/2.2/mod/mod_substitute.html
+Requires:	%{name}-base = %{version}-%{release}
+Provides:	apache(mod_substitute) = %{version}-%{release}
+
+%description mod_substitute
+The Substitute module provides a mechanism to perform both regular
+expression and fixed string substitutions on response bodies.
+
+%description mod_substitute -l pl.UTF-8
+Moduł pozwala na zastępowanie ciągów znaków w wyjściu również na
+podstawie wyrażenia regularnego.
+
 %package mod_unique_id
 Summary:	Apache module which provides a magic token for each request
 Summary(pl.UTF-8):	Moduł Apache'a nadający każdemu zapytaniu unikalny token
@@ -1959,6 +1975,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
 
 # anything in style dir not ending with .css is trash
 rm -rf $RPM_BUILD_ROOT%{_datadir}/manual/style/{lang,latex,xsl}
@@ -2223,6 +2240,7 @@
 %module_scripts mod_speling
 %module_scripts mod_ssl
 %module_scripts mod_status
+%module_scripts mod_substitute
 %module_scripts mod_unique_id
 %module_scripts mod_userdir
 %module_scripts mod_usertrack
@@ -2642,6 +2660,11 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_status.conf
 %attr(755,root,root) %{_libexecdir}/mod_status.so
 
+%files mod_substitute
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_substitute.conf
+%attr(755,root,root) %{_libexecdir}/mod_substitute.so
+
 %files mod_unique_id
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_unique_id.conf
@@ -2692,6 +2715,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
+- one more CVE to info about 2.2.6 release
+
 Revision 1.498.2.9  2007-12-09 10:35:37  glen
 - rel 3
 
@@ -2709,8 +2737,8 @@
 - P: webserver(log)
 
 Revision 1.498.2.4  2007/09/11 08:12:25  adamg
-- updated to 2.2.6 (CVE-2007-3847, CVE-2007-1863, CVE-2007-3304,
-  CVE-2006-5752, CVE-2007-1862)
+- updated to 2.2.6 (CVE-2007-3847, CVE-2007-1863, CVE-2007-3304, CVE-2006-5752,
+  CVE-2007-1862, CVE-2007-4465)
 
 Revision 1.498.2.3  2007/04/09 12:23:14  glen
 - PLD branding; rel 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache.spec?r1=1.498.2.9&r2=1.498.2.10&f=u