[apache2] 04/09: Refresh patches on top of upstream release 2.4.29

[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 8bc7271760ef3b82014f0371ce7e4b567f878099
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Oct 23 14:42:52 2017 +0000

    Refresh patches on top of upstream release 2.4.29
---
 debian/patches/build_suexec-custom.patch | 2 +-
 debian/patches/fhs_compliance.patch      | 4 ++--
 debian/patches/mod_ssl_md-2.4.x-v5.diff  | 6 +++---
 debian/patches/series                    | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/patches/build_suexec-custom.patch b/debian/patches/build_suexec-custom.patch
index 7069486..836f556 100644
--- a/debian/patches/build_suexec-custom.patch
+++ b/debian/patches/build_suexec-custom.patch
@@ -4,7 +4,7 @@ Author: Stefan Fritsch <sf at debian.org>
 Last-Update: 2012-02-25
 --- apache2.orig/Makefile.in
 +++ apache2/Makefile.in
-@@ -260,14 +260,16 @@ install-man:
+@@ -270,14 +270,16 @@ install-man:
  	fi
  
  install-suexec:
diff --git a/debian/patches/fhs_compliance.patch b/debian/patches/fhs_compliance.patch
index 1da4d67..62fc20b 100644
--- a/debian/patches/fhs_compliance.patch
+++ b/debian/patches/fhs_compliance.patch
@@ -4,7 +4,7 @@ Author: Adam Conrad <adconrad at 0c3.net>
 Last-Update: 2012-02-25
 --- apache2.orig/configure
 +++ apache2/configure
-@@ -37115,17 +37115,17 @@ ap_prefix="${ap_cur}"
+@@ -37740,17 +37740,17 @@ ap_prefix="${ap_cur}"
  
  
  cat >>confdefs.h <<_ACEOF
@@ -27,7 +27,7 @@ Last-Update: 2012-02-25
  
 --- apache2.orig/configure.in
 +++ apache2/configure.in
-@@ -834,11 +834,11 @@ rm -f modules.c
+@@ -843,11 +843,11 @@ rm -f modules.c
  echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c
  
  APR_EXPAND_VAR(ap_prefix, $prefix)
diff --git a/debian/patches/mod_ssl_md-2.4.x-v5.diff b/debian/patches/mod_ssl_md-2.4.x-v5.diff
index 1be7e9d..1fc4f34 100644
--- a/debian/patches/mod_ssl_md-2.4.x-v5.diff
+++ b/debian/patches/mod_ssl_md-2.4.x-v5.diff
@@ -193,7 +193,7 @@
          /*
 --- apache2.orig/modules/ssl/ssl_private.h
 +++ apache2/modules/ssl/ssl_private.h
-@@ -505,6 +505,7 @@ typedef struct {
+@@ -524,6 +524,7 @@ typedef struct {
      server_rec *server;
      
      const char *cipher_suite; /* cipher suite used in last reneg */
@@ -201,7 +201,7 @@
  } SSLConnRec;
  
  /* BIG FAT WARNING: SSLModConfigRec has unusual memory lifetime: it is
-@@ -581,6 +582,9 @@ typedef struct {
+@@ -600,6 +601,9 @@ typedef struct {
       * sent in the CertificateRequest message: */
      const char  *ca_name_path;
      const char  *ca_name_file;
@@ -211,7 +211,7 @@
  } modssl_pk_server_t;
  
  typedef struct {
-@@ -1046,6 +1050,9 @@ void ssl_init_ocsp_certificates(server_r
+@@ -1063,6 +1067,9 @@ void ssl_init_ocsp_certificates(server_r
   * memory. */
  DH *modssl_get_dh_params(unsigned keylen);
  
diff --git a/debian/patches/series b/debian/patches/series
index 4222533..6e395fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,5 +9,4 @@ reproducible_builds.diff
 #suexec-custom.patch
 
 fix_logresolve_segfault.patch
-CVE-2017-9798.diff
 mod_ssl_md-2.4.x-v5.diff

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