packages: apache/apache.spec, apache/PR46949.diff (REMOVED), apache/apache-...

[arekm]

Author: arekm                        Date: Tue Jul 28 13:48:23 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.2.12 (fixes CVE-2009-1891, CVE-2009-1195, CVE-2009-1890, CVE-2009-1191)

---- Files affected:
packages/apache:
   apache.spec (1.566 -> 1.567) , PR46949.diff (1.1 -> NONE)  (REMOVED), apache-pollset-segv.patch (1.1 -> NONE)  (REMOVED), apache-prefork-graceful-fix.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.566 packages/apache/apache.spec:1.567
--- packages/apache/apache.spec:1.566	Mon Jun  1 15:18:33 2009
+++ packages/apache/apache.spec	Tue Jul 28 15:48:17 2009
@@ -19,12 +19,12 @@
 Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
-Version:	2.2.11
-Release:	13
+Version:	2.2.12
+Release:	1
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5:	03e0a99a5de0f3f568a0087fb9993af9
+# Source0-md5:	17f017b571f88aa60abebfe2945d7caf
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -73,14 +73,7 @@
 Patch20:	%{name}-apxs.patch
 Patch23:	%{name}-suexec_fcgi.patch
 Patch24:	%{name}-revert-bug-40463.patch
-Patch25:	%{name}-prefork-graceful-fix.patch
-Patch26:	%{name}-pollset-segv.patch
-# Official patches
-# http://www.apache.org/dist/httpd/patches/apply_to_2.2.11/
-Patch27:	PR46949.diff
 URL:		http://httpd.apache.org/
-# http://svn.apache.org/viewvc?view=rev&revision=772997
-BuildRequires:	security(CVE-2009-1195)
 BuildRequires:	apr-devel >= 1:1.2
 BuildRequires:	apr-util-devel >= 1:1.3
 BuildRequires:	autoconf
@@ -1731,10 +1724,8 @@
 %patch19 -p1
 %patch20 -p1
 %patch23 -p1
-%patch24 -p1
-%patch25 -p0
-%patch26 -p0
-%patch27 -p0
+# disable for now, we'll see how things are handled now
+#%patch24 -p1
 
 # using system apr, apr-util and pcre
 rm -rf srclib/{apr,apr-util,pcre}
@@ -2713,6 +2704,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.567  2009/07/28 13:48:17  arekm
+- up to 2.2.12 (fixes CVE-2009-1891, CVE-2009-1195, CVE-2009-1890, CVE-2009-1191)
+
 Revision 1.566  2009/06/01 13:18:33  blues
 - CVE-2009-1195 security blocker
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.566&r2=1.567&f=u