Adapt to 2.4.9

* remove obsolete find_config_m4_LP1251939 patch
* changelog

3 files changed, 21 insertions, 36 deletions

diff --git a/debian/changelog b/debian/changelog
index 81912754..e8e65749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,31 @@
-apache2 (2.4.7-2) UNRELEASED; urgency=medium
+apache2 (2.4.9-1) UNRELEASED; urgency=medium
 
+  * New upstream version.
+    Security fixes:
+    - CVE-2013-6438: mod_dav: Fix DoS from crafted DAV WRITE requests.
+    - CVE-2014-0098: mod_log_config: Fix segfaults when logging truncated
+                     cookies.
+    Notable new features:
+    - Support named groups and backreferences within the LocationMatch,
+      DirectoryMatch, FilesMatch and ProxyMatch directives.
+    - mod_proxy: Added support for unix domain sockets as the backend server
+      endpoint.
+    - mod_ssl: Add support for OpenSSL configuration commands by introducing
+      the SSLOpenSSLConfCmd directive.
+    - mod_authz_user, mod_authz_host, mod_authz_groupfile, mod_authz_dbm,
+      mod_authz_dbd, mod_authnz_ldap: Support the expression parser within the
+      require directives.
+    - mod_rewrite: Add RewriteOptions InheritDown, InheritDownBefore,
+      and IgnoreInherit.
+    - Bugfix in the build system to avoid problems with patched config.m4
+      files as in LP #1251939.
   * Make default cipher list in ssl.conf more secure:
     - Remove 'MEDIUM'. This disables RC4 and SEED. Also remove '!MD5' because
       'HIGH' does not include MD5.
     - Remove the 'Speed-optimized SSL Cipher' configuration example because
       it depends on RC4, which is considered insecure.
-  * Patch the build system to avoid problems with patched config.m4's 
-    as in LP #1251939 in the future.
 
- -- Stefan Fritsch <sf@debian.org>  Sun, 12 Jan 2014 22:56:52 +0100
+ -- Stefan Fritsch <sf@debian.org>  Sat, 29 Mar 2014 22:06:50 +0100
 
 apache2 (2.4.7-1) unstable; urgency=low
 
diff --git a/debian/patches/find_config_m4_LP1251939 b/debian/patches/find_config_m4_LP1251939
deleted file mode 100644
index 38c957e1..00000000
--- a/debian/patches/find_config_m4_LP1251939
+++ /dev/null
@@ -1,31 +0,0 @@
-LP: #1251939
-
-commit 60f2545f1858415d31dcf0bb625262216c7821cd
-Author: Stefan Fritsch <sf@apache.org>
-Date:   Sat Nov 16 23:49:04 2013 +0000
-
-    Explicitly list in which directories to look for config*.m4 files.
-    
-    If some distributor patches a config*.m4 file with quilt, that will
-    place a copy of the original file in .pc/ . Doing a naive "find ."
-    will then cause both the original and the patched m4 file to be included,
-    causing havoc later on.
-    
-    PR: 55787
-    
-    
-    git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542615 13f79535-47bb-0310-9956-ffa450edef68
-
-Index: apache2/build/config-stubs
-===================================================================
---- apache2.orig/build/config-stubs
-+++ apache2/build/config-stubs
-@@ -15,7 +15,7 @@
- # config files without a number are sorted before those with a number.
- #
- 
--configfiles=`find . -name "config*.m4" | \
-+configfiles=`find os server modules support -name "config*.m4" | \
- 	sed 's#\(.*/config\)\(.*\).m4#\20 \1\2.m4#' | \
- 	sort | \
- 	sed 's#.* ##'`
diff --git a/debian/patches/series b/debian/patches/series
index fcb19af8..fce31717 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ customize_apxs.patch
 build_suexec-custom.patch
 # This patch is applied manually
 #suexec-custom.patch
-find_config_m4_LP1251939