- up to 2.2.18; fixes CVE-2011-0419; make it depend on apr 1.4.4 (security fixes)

Changed files:
    apache-bug-41743.patch -> 1.2
    apache-mpm-itk.patch -> 1.2
    apache.spec -> 1.623

diff --git a/apache-bug-41743.patch b/apache-bug-41743.patch
deleted file mode 100644 (file)
index 476e953..0000000
--- a/apache-bug-41743.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: server/mpm/prefork/prefork.c
-===================================================================
---- server/mpm/prefork/prefork.c       (wersja 1069427)
-+++ server/mpm/prefork/prefork.c       (wersja 1069428)
-@@ -330,6 +330,7 @@
- 
- static void stop_listening(int sig)
- {
-+    mpm_state = AP_MPMQ_STOPPING;
-     ap_close_listeners();
- 
-     /* For a graceful stop, we want the child to exit when done */
-@@ -350,6 +351,7 @@
-          */
-         return;
-     }
-+    mpm_state = AP_MPMQ_STOPPING;
-     shutdown_pending = 1;
-     is_graceful = (sig == AP_SIG_GRACEFUL_STOP);
- }
-@@ -363,6 +365,7 @@
-         /* Probably not an error - don't bother reporting it */
-         return;
-     }
-+    mpm_state = AP_MPMQ_STOPPING;
-     restart_pending = 1;
-     is_graceful = (sig == AP_SIG_GRACEFUL);
- }
-@@ -458,8 +461,10 @@
- 
- int ap_graceful_stop_signalled(void)
- {
--    /* not ever called anymore... */
--    return 0;
-+    /* Return true if the server is stopping for whatever reason; the
-+     * function is used to initiate a fast exit from the connection
-+     * processing loop. */
-+    return mpm_state == AP_MPMQ_STOPPING;
- }
- 
- 
-

diff --git a/apache-mpm-itk.patch b/apache-mpm-itk.patch
index de1b1bf2c55bab317c3f95e80faf445322b41f3b..90a73eb90368deee00d704a52361561dcd92f72f 100644 (file)
--- a/apache-mpm-itk.patch
+++ b/apache-mpm-itk.patch
@@ -1923,8 +1923,8 @@ unchanged:
  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

diff --git a/apache.spec b/apache.spec
index b4c2265461da90375cf536380804b4d8a367d43c..9747418ad617cd9d4aaf4178f4a8c5993725a414 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -41,12 +41,12 @@ Summary(pt_BR.UTF-8):       Servidor HTTPD para prover serviços WWW
 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
@@ -98,12 +98,11 @@ Patch24:    %{name}-bug-48094.patch
 # 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
@@ -198,7 +197,7 @@ Requires(pre):      /usr/bin/getgid
 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}
@@ -1791,7 +1790,6 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
-%patch27 -p0
 %patch28 -p1
 %patch29 -p1