[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.4-2-11-g3770f98

[Arno Töll]

The following commit has been merged in the next branch:
commit d86190806237aff09818afc3e256d1b560b07d60
Author: Arno Töll <arno at debian.org>
Date:   Sun May 12 15:51:35 2013 +0200

    Fix 707109: Remove double instantiation

diff --git a/debian/changelog b/debian/changelog
index 3f0080b..4bd0c52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,13 +15,16 @@ apache2 (2.4.4-3) UNRELEASED; urgency=low
     when queried from a2query (Closes: #683212)
   * Fix "/etc/init.d/apache2 start and restart need to wait until really
     started" (Closes: #645460)
+  * Fix "apxs2 outputs "uninitialized value" warnings" by removing the double
+    declaration of variables in apxs. This problem was harmless, but noisy
+    (Closes: #707109)
 
   [ Stefan Fritsch ]
   * Remove paragraph about MaxMemFree in README.Debian. The issue should be
     fixed in 2.4.
   * Enable mod_authn_core when upgrading from wheezy (Closes: #702866)
 
- -- Arno Töll <arno at debian.org>  Sun, 12 May 2013 15:17:07 +0200
+ -- Arno Töll <arno at debian.org>  Sun, 12 May 2013 15:50:15 +0200
 
 apache2 (2.4.4-2) experimental; urgency=low
 
diff --git a/debian/patches/customize_apxs.patch b/debian/patches/customize_apxs.patch
index ce773bb..7ccca92 100644
--- a/debian/patches/customize_apxs.patch
+++ b/debian/patches/customize_apxs.patch
@@ -8,18 +8,16 @@ Last-Update: 2012-03-17
 
 --- a/support/apxs.in
 +++ b/support/apxs.in
-@@ -38,7 +38,9 @@
+@@ -38,7 +38,7 @@
  my $CFG_TARGET     = get_vars("progname");
  my $CFG_SYSCONFDIR = get_vars("sysconfdir");
  my $CFG_CFLAGS     = join ' ', map { get_vars($_) }
 -  qw(SHLTCFLAGS CFLAGS NOTEST_CPPFLAGS EXTRA_CPPFLAGS EXTRA_CFLAGS);
 +  qw(SHLTCFLAGS CFLAGS CPPFLAGS NOTEST_CPPFLAGS EXTRA_CPPFLAGS EXTRA_CFLAGS);
-+my $CFG_LDFLAGS    = join ' ', map { get_vars($_) }
-+  qw(LDFLAGS NOTEST_LDFLAGS SH_LDFLAGS);
  my $CFG_LDFLAGS    = join ' ', map { get_vars($_) }
    qw(LDFLAGS NOTEST_LDFLAGS SH_LDFLAGS);
  my $includedir     = get_vars("includedir");
-@@ -276,6 +278,7 @@
+@@ -276,6 +276,7 @@
      $data =~ s|%TARGET%|$CFG_TARGET|sg;
      $data =~ s|%PREFIX%|$prefix|sg;
      $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
@@ -27,7 +25,7 @@ Last-Update: 2012-03-17
  
      my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
  
-@@ -428,7 +431,7 @@
+@@ -428,7 +429,7 @@
          $la =~ s|\.c$|.la|;
          my $o = $s;
          $o =~ s|\.c$|.o|;
@@ -36,7 +34,7 @@ Last-Update: 2012-03-17
          unshift(@objs, $lo);
      }
  
-@@ -469,7 +472,7 @@
+@@ -469,7 +470,7 @@
          $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
      }
  
@@ -45,7 +43,7 @@ Last-Update: 2012-03-17
  
      #   execute the commands
      &execute_cmds(@cmds);
-@@ -503,7 +506,7 @@
+@@ -503,7 +504,7 @@
          if ($opt_i) {
  	    push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
                   "$libtool' $f $CFG_LIBEXECDIR");
@@ -54,7 +52,7 @@ Last-Update: 2012-03-17
          }
  
          #   determine module symbolname and filename
-@@ -539,10 +542,11 @@
+@@ -539,10 +540,11 @@
              $filename = "mod_${name}.c";
          }
          my $dir = $CFG_LIBEXECDIR;
@@ -68,7 +66,7 @@ Last-Update: 2012-03-17
      }
  
      #   execute the commands
-@@ -550,108 +554,35 @@
+@@ -550,108 +552,35 @@
  
      #   activate module via LoadModule/AddModule directive
      if ($opt_a or $opt_A) {
@@ -112,11 +110,6 @@ Last-Update: 2012-03-17
 -                if ($cntopen == $cntclose) {
 -                    # fine. Last LoadModule is contextless.
 -                    $content =~ s|^(.*\n#?\s*LoadModule\s+[^\n]+\n)|$1$c$lmd\n|s;
--                }
--                elsif ($cntopen < $cntclose) {
--                    error('Configuration file is not valid. There are sections'
--                          . ' closed before opened.');
--                    exit(1);
 +        my $entry;
 +        foreach $entry (@lmd) {
 +            my ($name, $lmd) = @{$entry};
@@ -126,6 +119,11 @@ Last-Update: 2012-03-17
 +                if (system($cmd) != 0) {
 +                    die "'$cmd' failed\n";
                  }
+-                elsif ($cntopen < $cntclose) {
+-                    error('Configuration file is not valid. There are sections'
+-                          . ' closed before opened.');
+-                    exit(1);
+-                }
 -                else {
 -                    # put our cmd after the section containing the last
 -                    # LoadModule.
@@ -200,7 +198,7 @@ Last-Update: 2012-03-17
      }
  }
  
-@@ -671,8 +602,8 @@
+@@ -671,8 +600,8 @@
  ##
  
  builddir=.

-- 
Debian packaging for apache2