[apache2] 04/05: Adjust for 2.4.20

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit 79c15e3c0236369cc816f4bd2351bb94f3605514
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Apr 9 13:49:31 2016 +0200

    Adjust for 2.4.20
    
    - adjust changelog
    - drop backported prefork_single_process_crash.patch
---
 debian/changelog                                  |  4 +++-
 debian/patches/prefork_single_process_crash.patch | 15 ---------------
 debian/patches/series                             |  1 -
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9cbb38d..39de3c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-apache2 (2.4.18-3) UNRELEASED; urgency=medium
+apache2 (2.4.20-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - mostly bugfixes and HTTP/2 improvements
   * Build against lua 5.2 instead of 5.1. Closes: #820243
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 09 Apr 2016 13:41:04 +0200
diff --git a/debian/patches/prefork_single_process_crash.patch b/debian/patches/prefork_single_process_crash.patch
deleted file mode 100644
index c644a8b..0000000
--- a/debian/patches/prefork_single_process_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# prefork part of
-# https://svn.apache.org/r1711479
-# https://svn.apache.org/r1711919 
---- apache2.orig/server/mpm/prefork/prefork.c
-+++ apache2/server/mpm/prefork/prefork.c
-@@ -1316,8 +1316,7 @@ static int prefork_open_logs(apr_pool_t
-     all_buckets = apr_pcalloc(pconf, num_buckets *
-                                      sizeof(prefork_child_bucket));
-     for (i = 0; i < num_buckets; i++) {
--        if (!one_process && /* no POD in one_process mode */
--                (rv = ap_mpm_pod_open(pconf, &all_buckets[i].pod))) {
-+        if ((rv = ap_mpm_pod_open(pconf, &all_buckets[i].pod))) {
-             ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
-                          (startup ? NULL : s),
-                          "could not open pipe-of-death");
diff --git a/debian/patches/series b/debian/patches/series
index b139c0d..aa0aae4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ reproducible_builds.diff
 
 # This patch is applied manually
 #suexec-custom.patch
-prefork_single_process_crash.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git