From 5540c687faf008d3a24d04b9946718c455947ffe512934382376f081a3c0f730 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 29 Jul 2010 09:22:03 +0000
Subject: [PATCH] merge

OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=318
---
 apache2.changes              | 36 ++++++++++++++++++++++++++++++++++++
 apache2.spec                 |  8 ++++----
 httpd-2.2.0-apxs-a2enmod.dif | 16 ++++++++++------
 httpd-2.2.15.tar.bz2         |  3 ---
 httpd-2.2.16.tar.bz2         |  3 +++
 5 files changed, 53 insertions(+), 13 deletions(-)
 delete mode 100644 httpd-2.2.15.tar.bz2
 create mode 100644 httpd-2.2.16.tar.bz2

diff --git a/apache2.changes b/apache2.changes
index 0f373cf..4d22b59 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Wed Jul 28 12:07:33 UTC 2010 - poeml@cmdline.net
+
+- update to 2.2.16:
+  SECURITY: CVE-2010-1452 (cve.mitre.org)
+     mod_dav, mod_cache: Fix Handling of requests without a path segment.
+     PR: 49246
+  SECURITY: CVE-2010-2068 (cve.mitre.org)
+     mod_proxy_ajp, mod_proxy_http, mod_reqtimeout: Fix timeout detection
+     for platforms Windows, Netware and OS2.  PR: 49417.
+  core:
+   - Filter init functions are now run strictly once per request
+     before handler invocation.  The init functions are no longer run
+     for connection filters.  PR 49328.
+  mod_filter:
+   - enable it to act on non-200 responses.  PR 48377
+  mod_ldap: 
+   - LDAP caching was suppressed (and ldap-status handler returns
+     title page only) when any mod_ldap directives were used in VirtualHost
+     context.
+  mod_ssl: 
+   - Fix segfault at startup if proxy client certs are shared
+     across multiple vhosts.  PR 39915.
+  mod_proxy_http: 
+   - Log the port of the remote server in various messages.
+     PR 48812.
+  apxs: 
+   - Fix -A and -a options to ignore whitespace in httpd.conf
+  mod_dir: 
+   - add FallbackResource directive, to enable admin to specify
+     an action to happen when a URL maps to no file, without resorting
+     to ErrorDocument or mod_rewrite.  PR 47184
+  mod_rewrite: 
+   - Allow to set environment variables without explicitely
+     giving a value.
+
 -------------------------------------------------------------------
 Mon May 17 14:33:47 UTC 2010 - poeml@cmdline.net
 
diff --git a/apache2.spec b/apache2.spec
index 7706378..5c76470 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package apache2 (Version 2.2.15)
+# spec file for package apache2 (Version 2.2.16)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -62,9 +62,9 @@ BuildRequires:  expat-devel
 %define platform_string	Linux/%VENDOR
 License:        ASLv..
 Group:          Productivity/Networking/Web/Servers
-%define realver 2.2.15
-Version:        2.2.15
-Release:        3
+%define realver 2.2.16
+Version:        2.2.16
+Release:        2
 #Source0:      http://www.apache.org/dist/httpd-%{version}.tar.bz2
 Source0:        http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2
 # Add file to take mtime from it in prep section
diff --git a/httpd-2.2.0-apxs-a2enmod.dif b/httpd-2.2.0-apxs-a2enmod.dif
index 9583d7a..0a15f21 100644
--- a/httpd-2.2.0-apxs-a2enmod.dif
+++ b/httpd-2.2.0-apxs-a2enmod.dif
@@ -1,7 +1,8 @@
-diff -uNr httpd-2.2.0.orig/support/apxs.in httpd-2.2.0/support/apxs.in
---- httpd-2.2.0.orig/support/apxs.in	2005-06-10 11:18:14.000000000 +0200
-+++ httpd-2.2.0/support/apxs.in	2005-12-07 11:04:38.337999601 +0100
-@@ -527,105 +527,14 @@
+Index: httpd-2.2.16/support/apxs.in
+===================================================================
+--- httpd-2.2.16.orig/support/apxs.in
++++ httpd-2.2.16/support/apxs.in
+@@ -526,108 +526,14 @@ if ($opt_i or $opt_e) {
  
      #   activate module via LoadModule/AddModule directive
      if ($opt_a or $opt_A) {
@@ -25,7 +26,10 @@ diff -uNr httpd-2.2.0.orig/support/apxs.in httpd-2.2.0/support/apxs.in
          $c = '#' if ($opt_A);
          foreach $lmd (@lmd) {
 -            my $what = $opt_A ? "preparing" : "activating";
--            if ($content !~ m|\n#?\s*$lmd|) {
+-            my $lmd_re = $lmd;
+-            $lmd_re =~ s/\s+/\\s+/g;
+-
+-            if ($content !~ m|\n#?\s*$lmd_re|) {
 -                # check for open <containers>, so that the new LoadModule
 -                # directive always appears *outside* of an <container>.
 -
@@ -88,7 +92,7 @@ diff -uNr httpd-2.2.0.orig/support/apxs.in httpd-2.2.0/support/apxs.in
 -                }
 -            } else {
 -                # replace already existing LoadModule line
--                $content =~ s|^(.*\n)#?\s*$lmd[^\n]*\n|$1$c$lmd\n|s;
+-                $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s;
 -            }
 -            $lmd =~ m|LoadModule\s+(.+?)_module.*|;
 -            notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]");
diff --git a/httpd-2.2.15.tar.bz2 b/httpd-2.2.15.tar.bz2
deleted file mode 100644
index 4026f5b..0000000
--- a/httpd-2.2.15.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ae0c428e7abd87eecbac8564d90a7182104325bae7086c21db7b3a1e3140ca7
-size 4959582
diff --git a/httpd-2.2.16.tar.bz2 b/httpd-2.2.16.tar.bz2
new file mode 100644
index 0000000..fb3033a
--- /dev/null
+++ b/httpd-2.2.16.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9457d57a6bea15ce5bde83c88803c030953b99bdd0fbae65854adff527ed4c52
+size 4775545