[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-6-33-gb46d990

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit bc9b181b71a80b7a2fea4d794c8cdfb8c5cff5ab
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Jul 21 17:19:20 2013 +0200

    refresh some patches
    
    trivial changes only

diff --git a/debian/patches/add-itk-to-build-system.patch b/debian/patches/add-itk-to-build-system.patch
index 845e970..4f21460 100644
--- a/debian/patches/add-itk-to-build-system.patch
+++ b/debian/patches/add-itk-to-build-system.patch
@@ -1,10 +1,8 @@
 Add the new MPM to the build system as an alternative to the other MPMs
 and add itk's dependency to libcap.
 
-Index: httpd-2.4.1/server/mpm/config2.m4
-===================================================================
---- httpd-2.4.1.orig/server/mpm/config2.m4
-+++ httpd-2.4.1/server/mpm/config2.m4
+--- a/server/mpm/config2.m4
++++ b/server/mpm/config2.m4
 @@ -1,7 +1,7 @@
  AC_MSG_CHECKING(which MPM to use by default)
  AC_ARG_WITH(mpm,
@@ -14,7 +12,7 @@ Index: httpd-2.4.1/server/mpm/config2.m4
                            This will be statically linked as the only available MPM unless
                            --enable-mpms-shared is also specified.
  ),[
-@@ -66,6 +66,9 @@ for i in $ap_enabled_mpms; do
+@@ -66,6 +66,9 @@
      else
          AC_MSG_ERROR([MPM $i is not supported on this platform.])
      fi
@@ -24,11 +22,9 @@ Index: httpd-2.4.1/server/mpm/config2.m4
  done
  
  if test $mpm_build = "shared"; then
-Index: httpd-2.4.1/modules/arch/unix/config5.m4
-===================================================================
---- httpd-2.4.1.orig/modules/arch/unix/config5.m4
-+++ httpd-2.4.1/modules/arch/unix/config5.m4
-@@ -3,6 +3,7 @@ APACHE_MODPATH_INIT(arch/unix)
+--- a/modules/arch/unix/config5.m4
++++ b/modules/arch/unix/config5.m4
+@@ -3,6 +3,7 @@
  
  if ap_mpm_is_enabled "worker" \
     || ap_mpm_is_enabled "event" \
diff --git a/debian/patches/dbm_read_hash_or_btree.patch b/debian/patches/dbm_read_hash_or_btree.patch
index 6fbb54a..5e8689a 100644
--- a/debian/patches/dbm_read_hash_or_btree.patch
+++ b/debian/patches/dbm_read_hash_or_btree.patch
@@ -2,10 +2,8 @@ Description: Be more liberal in the sorts of DBM files we accept.
 Forwarded: no
 Author: Adam Conrad <adconrad at 0c3.net>
 Last-Update: 2012-02-25
-Index: apache2/support/dbmmanage.in
-===================================================================
---- apache2.orig/support/dbmmanage.in
-+++ apache2/support/dbmmanage.in
+--- a/support/dbmmanage.in
++++ b/support/dbmmanage.in
 @@ -25,7 +25,7 @@
  BEGIN { @AnyDBM_File::ISA = qw(DB_File NDBM_File GDBM_File SDBM_File) }
  use strict;
diff --git a/debian/patches/fhs_compliance.patch b/debian/patches/fhs_compliance.patch
index 644a933..d30ad89 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
 --- a/configure
 +++ b/configure
-@@ -32270,17 +32270,17 @@
+@@ -32709,17 +32709,17 @@
  
  
  cat >>confdefs.h <<_ACEOF
@@ -27,7 +27,7 @@ Last-Update: 2012-02-25
  
 --- a/configure.in
 +++ b/configure.in
-@@ -818,11 +818,11 @@
+@@ -819,11 +819,11 @@
  echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c
  
  APR_EXPAND_VAR(ap_prefix, $prefix)
diff --git a/debian/patches/itk-fix-htaccess-reads-for-persistent-connections.patch b/debian/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
index ea7b724..b24ae53 100644
--- a/debian/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
+++ b/debian/patches/itk-fix-htaccess-reads-for-persistent-connections.patch
@@ -15,7 +15,7 @@ the same connection.
  APR_HOOK_STRUCT(
             APR_HOOK_LINK(header_parser)
             APR_HOOK_LINK(pre_config)
-@@ -2139,6 +2141,32 @@
+@@ -2138,6 +2140,32 @@
          else {
              if (!APR_STATUS_IS_ENOENT(status)
                  && !APR_STATUS_IS_ENOTDIR(status)) {
diff --git a/debian/patches/no_LD_LIBRARY_PATH.patch b/debian/patches/no_LD_LIBRARY_PATH.patch
index a55cd03..85966fd 100644
--- a/debian/patches/no_LD_LIBRARY_PATH.patch
+++ b/debian/patches/no_LD_LIBRARY_PATH.patch
@@ -2,10 +2,8 @@ Description: Remove LD_LIBRARY_PATH from envvars-std
 Forwarded: no
 Author: Adam Conrad <adconrad at 0c3.net>
 Last-Update: 2012-04-15
-Index: apache2/support/envvars-std.in
-===================================================================
---- apache2.orig/support/envvars-std.in
-+++ apache2/support/envvars-std.in
+--- a/support/envvars-std.in
++++ b/support/envvars-std.in
 @@ -18,11 +18,4 @@
  #
  # This file is generated from envvars-std.in
diff --git a/debian/patches/suexec-CVE-2007-1742.patch b/debian/patches/suexec-CVE-2007-1742.patch
index 62e6239..9ea0ee0 100644
--- a/debian/patches/suexec-CVE-2007-1742.patch
+++ b/debian/patches/suexec-CVE-2007-1742.patch
@@ -14,7 +14,7 @@ Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=44752
  
  #include <stdio.h>
  #include <stdarg.h>
-@@ -257,6 +258,7 @@
+@@ -261,6 +262,7 @@
      struct group *gr;       /* group entry holder        */
      struct stat dir_info;   /* directory info holder     */
      struct stat prg_info;   /* program info holder       */
@@ -22,7 +22,7 @@ Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=44752
  
      /*
       * Start with a "clean" environment
-@@ -491,11 +493,16 @@
+@@ -502,11 +504,16 @@
          exit(111);
      }
  
@@ -40,7 +40,7 @@ Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=44752
              log_err("cannot get docroot information (%s)\n", target_homedir);
              exit(112);
          }
-@@ -503,12 +510,18 @@
+@@ -514,12 +521,18 @@
      else {
          if (((chdir(AP_DOC_ROOT)) != 0) ||
              ((getcwd(dwd, AP_MAXPATH)) == NULL) ||

-- 
Debian packaging for apache2