[Pkg-apache-commits] r1178 - in /trunk/apache2: changelog patches/00list patches/081_apxs_perl_5.12.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Wed Apr 14 20:30:29 2010
New Revision: 1178

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1178
Log:
Fix apxs2 to work with perl 5.12rc3

Added:
    trunk/apache2/patches/081_apxs_perl_5.12.dpatch   (with props)
Modified:
    trunk/apache2/changelog
    trunk/apache2/patches/00list

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1178&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Wed Apr 14 20:30:29 2010
@@ -6,6 +6,7 @@
   * Simplify logrotate script. Closes: #576105
   * Remove empty directory /usr/lib/debug/usr/sbin in mpm packages.
     Closes: #576089
+  * Fix apxs2 to work with perl 5.12rc3. Closes: #577239
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 03 Apr 2010 15:20:42 +0200
 

Modified: trunk/apache2/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/00list?rev=1178&op=diff
==============================================================================
--- trunk/apache2/patches/00list (original)
+++ trunk/apache2/patches/00list Wed Apr 14 20:30:29 2010
@@ -24,6 +24,7 @@
 077_CacheIgnoreURLSessionIdentifiers.dpatch
 079_polish_translation.dpatch
 080_mod_reqtimeout_fixes.dpatch
+081_apxs_perl_5.12.dpatch
 099_config_guess_sub_update
 200_cp_suexec.dpatch
 201_build_suexec-custom.dpatch

Added: trunk/apache2/patches/081_apxs_perl_5.12.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/081_apxs_perl_5.12.dpatch?rev=1178&op=file
==============================================================================
--- trunk/apache2/patches/081_apxs_perl_5.12.dpatch (added)
+++ trunk/apache2/patches/081_apxs_perl_5.12.dpatch Wed Apr 14 20:30:29 2010
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 081_apxs_perl_5.12.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix apxs for perl 5.12, submitted by Roderich Schupp
+## DP: Debian bug #577239
+## DP: upstream: http://svn.apache.org/viewvc?view=revision&revision=932791
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' httpd-2.2.15~/support/apxs.in httpd-2.2.15/support/apxs.in
+--- httpd-2.2.15~/support/apxs.in	2010-04-14 22:25:37.344175682 +0200
++++ httpd-2.2.15/support/apxs.in	2010-04-14 22:25:53.211177881 +0200
+@@ -83,7 +83,6 @@
+     my ($argumentative, @ARGV) = @_;
+     my $errs = 0;
+     local $_;
+-    local $[ = 0;
+ 
+     my @args = split / */, $argumentative;
+     while (@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/) {
+@@ -93,7 +92,7 @@
+             last;
+         }
+         my $pos = index($argumentative,$first);
+-        if ($pos >= $[) {
++        if ($pos >= 0) {
+             if ($pos < $#args && $args[$pos+1] eq ':') {
+                 shift @ARGV;
+                 if ($rest eq '') {

Propchange: trunk/apache2/patches/081_apxs_perl_5.12.dpatch
------------------------------------------------------------------------------
    svn:executable = *