[apache2] 02/09: Refresh quilt patches

[Ondřej Surý]

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

ondrej pushed a commit to branch master
in repository apache2.

commit 8ad6d33f58c3dc380302bd86f5a6762553e26b72
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Oct 23 14:34:32 2017 +0000

    Refresh quilt patches
---
 debian/patches/CVE-2017-9798.diff       |  8 +++-----
 debian/patches/fhs_compliance.patch     | 10 +---------
 debian/patches/no_LD_LIBRARY_PATH.patch |  4 ++--
 debian/patches/reproducible_builds.diff |  4 ----
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/debian/patches/CVE-2017-9798.diff b/debian/patches/CVE-2017-9798.diff
index dc37033..43a5aa8 100644
--- a/debian/patches/CVE-2017-9798.diff
+++ b/debian/patches/CVE-2017-9798.diff
@@ -17,11 +17,9 @@
 #    
 #    git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807754 13f79535-47bb-0310-9956-ffa450edef68
 #
-diff --git a/server/core.c b/server/core.c
-index de2400d92a..6516b09a05 100644
---- a/server/core.c
-+++ b/server/core.c
-@@ -2266,6 +2266,12 @@ AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd,
+--- apache2.orig/server/core.c
++++ apache2/server/core.c
+@@ -2262,6 +2262,12 @@ AP_CORE_DECLARE_NONSTD(const char *) ap_
              /* method has not been registered yet, but resource restriction
               * is always checked before method handling, so register it.
               */
diff --git a/debian/patches/fhs_compliance.patch b/debian/patches/fhs_compliance.patch
index 145ee99..1da4d67 100644
--- a/debian/patches/fhs_compliance.patch
+++ b/debian/patches/fhs_compliance.patch
@@ -2,11 +2,9 @@ Description: Fix up FHS file locations for apache2 droppings.
 Forwarded: not-needed
 Author: Adam Conrad <adconrad at 0c3.net>
 Last-Update: 2012-02-25
-Index: apache2/configure
-===================================================================
 --- apache2.orig/configure
 +++ apache2/configure
-@@ -36453,17 +36453,17 @@ ap_prefix="${ap_cur}"
+@@ -37115,17 +37115,17 @@ ap_prefix="${ap_cur}"
  
  
  cat >>confdefs.h <<_ACEOF
@@ -27,8 +25,6 @@ Index: apache2/configure
  _ACEOF
  
  
-Index: apache2/configure.in
-===================================================================
 --- apache2.orig/configure.in
 +++ apache2/configure.in
 @@ -834,11 +834,11 @@ rm -f modules.c
@@ -46,8 +42,6 @@ Index: apache2/configure.in
  	[Location of the MIME types config file, relative to the Apache root directory])
  
  perlbin=`$ac_aux_dir/PrintPath perl`
-Index: apache2/include/ap_config_layout.h.in
-===================================================================
 --- apache2.orig/include/ap_config_layout.h.in
 +++ apache2/include/ap_config_layout.h.in
 @@ -60,5 +60,6 @@
@@ -57,8 +51,6 @@ Index: apache2/include/ap_config_layout.h.in
 +#define DEFAULT_PIDLOG "/var/run/apache2.pid"
  
  #endif /* AP_CONFIG_LAYOUT_H */
-Index: apache2/include/httpd.h
-===================================================================
 --- apache2.orig/include/httpd.h
 +++ apache2/include/httpd.h
 @@ -109,7 +109,7 @@ extern "C" {
diff --git a/debian/patches/no_LD_LIBRARY_PATH.patch b/debian/patches/no_LD_LIBRARY_PATH.patch
index 85966fd..1815f9a 100644
--- a/debian/patches/no_LD_LIBRARY_PATH.patch
+++ b/debian/patches/no_LD_LIBRARY_PATH.patch
@@ -2,8 +2,8 @@ Description: Remove LD_LIBRARY_PATH from envvars-std
 Forwarded: no
 Author: Adam Conrad <adconrad at 0c3.net>
 Last-Update: 2012-04-15
---- a/support/envvars-std.in
-+++ b/support/envvars-std.in
+--- apache2.orig/support/envvars-std.in
++++ apache2/support/envvars-std.in
 @@ -18,11 +18,4 @@
  #
  # This file is generated from envvars-std.in
diff --git a/debian/patches/reproducible_builds.diff b/debian/patches/reproducible_builds.diff
index 42a6fd0..a12392a 100644
--- a/debian/patches/reproducible_builds.diff
+++ b/debian/patches/reproducible_builds.diff
@@ -5,8 +5,6 @@ Author: Jean-Michel Vourgère <nirgal at debian.org>
 Forwarded: no
 Last-Update: 2015-08-11
 
-Index: apache2/server/buildmark.c
-===================================================================
 --- apache2.orig/server/buildmark.c
 +++ apache2/server/buildmark.c
 @@ -17,11 +17,7 @@
@@ -22,8 +20,6 @@ Index: apache2/server/buildmark.c
  
  AP_DECLARE(const char *) ap_get_server_built()
  {
-Index: apache2/server/Makefile.in
-===================================================================
 --- apache2.orig/server/Makefile.in
 +++ apache2/server/Makefile.in
 @@ -1,3 +1,4 @@

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