Author: arekm                        Date: Mon May 16 08:18:09 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.2.18; fixes  CVE-2011-0419; make it depend on apr 1.4.4 (security 
fixes)

---- Files affected:
packages/apache:
   apache-mpm-itk.patch (1.1 -> 1.2) , apache.spec (1.622 -> 1.623) , 
apache-bug-41743.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/apache/apache-mpm-itk.patch
diff -u packages/apache/apache-mpm-itk.patch:1.1 
packages/apache/apache-mpm-itk.patch:1.2
--- packages/apache/apache-mpm-itk.patch:1.1    Thu Mar 10 11:41:03 2011
+++ packages/apache/apache-mpm-itk.patch        Mon May 16 10:18:03 2011
@@ -1923,8 +1923,8 @@
  AC_MSG_CHECKING(which MPM to use)
  AC_ARG_WITH(mpm,
  APACHE_HELP_STRING(--with-mpm=MPM,Choose the process model for Apache to use.
--                          MPM={beos|event|worker|prefork|mpmt_os2}),[
-+                          MPM={beos|event|worker|prefork|mpmt_os2|itk}),[
+-                          MPM={beos|event|worker|prefork|mpmt_os2|winnt}),[
++                          
MPM={beos|event|worker|prefork|mpmt_os2|winnt|itk}),[
    APACHE_MPM=$withval
  ],[
    if test "x$APACHE_MPM" = "x"; then

================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.622 packages/apache/apache.spec:1.623
--- packages/apache/apache.spec:1.622   Sun Apr  3 15:22:25 2011
+++ packages/apache/apache.spec Mon May 16 10:18:03 2011
@@ -42,12 +42,12 @@
 Summary(ru.UTF-8):     Самый популярный веб-сервер
 Summary(tr.UTF-8):     Lider WWW tarayıcı
 Name:          apache
-Version:       2.2.17
-Release:       11
+Version:       2.2.18
+Release:       1
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: 66d8e107f85acc039fd5e624e85728a9
+# Source0-md5: f719de25956eeb52728beb6311e836b5
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -99,12 +99,11 @@
 # 
http://scripts.mit.edu/trac/browser/trunk/server/common/patches/httpd-2.2.x-mod_ssl-sessioncaching.patch?rev=1348
 Patch25:       httpd-2.2.x-mod_ssl-sessioncaching.patch
 Patch26:       apache-mod_vhost_alias_docroot.patch
-Patch27:       apache-bug-41743.patch
 # http://mpm-itk.sesse.net/
 Patch28:       apache-mpm-itk.patch
 Patch29:       libtool-tag.patch
 URL:           http://httpd.apache.org/
-BuildRequires: apr-devel >= 1:1.2
+BuildRequires: apr-devel >= 1:1.4.4
 BuildRequires: apr-util-devel >= 1:1.3.10-2
 BuildRequires: autoconf
 BuildRequires: automake
@@ -199,7 +198,7 @@
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires:      /sbin/chkconfig
-Requires:      apr >= 1:1.2
+Requires:      apr >= 1:1.4.4
 Requires:      psmisc >= 20.1
 Requires:      rc-scripts >= 0.4.1.23
 Provides:      apache(modules-api) = %{_apache_modules_api}
@@ -1792,7 +1791,6 @@
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
-%patch27 -p0
 %patch28 -p1
 %patch29 -p1
 
@@ -2784,6 +2782,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.623  2011/05/16 08:18:03  arekm
+- up to 2.2.18; fixes  CVE-2011-0419; make it depend on apr 1.4.4 (security 
fixes)
+
 Revision 1.622  2011/04/03 13:22:25  glen
 - default UTF-8 encoding
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-mpm-itk.patch?r1=1.1&r2=1.2&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.622&r2=1.623&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to