diff --git a/apache2.changes b/apache2.changes index 6a525c9..7f06909 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 11 21:42:11 UTC 2010 - lars@linux-schulserver.de + +- fix deprecated usage of $[ in apxs2 + (httpd-2.2.15-deprecated_use_of_build_in_variable.patch) + ------------------------------------------------------------------- Fri May 7 12:38:10 UTC 2010 - aj@suse.de diff --git a/apache2.spec b/apache2.spec index 4fab696..7706378 100644 --- a/apache2.spec +++ b/apache2.spec @@ -64,7 +64,7 @@ License: ASLv.. Group: Productivity/Networking/Web/Servers %define realver 2.2.15 Version: 2.2.15 -Release: 2 +Release: 3 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2 # Add file to take mtime from it in prep section @@ -120,6 +120,8 @@ Patch66: httpd-2.0.54-envvars.dif Patch67: httpd-2.2.0-apxs-a2enmod.dif Patch68: httpd-2.x.x-logresolve.patch Patch100: apache2.2-mpm-itk-20090414-00.patch +# PATCH-FIX-UPSTREAM fix deprecated usage of $[ in apxs2 +Patch101: httpd-2.2.15-deprecated_use_of_build_in_variable.patch Url: http://httpd.apache.org/ Icon: Apache.xpm Summary: The Apache Web Server Version 2.0 @@ -389,6 +391,7 @@ Authors: %patch67 -p1 %patch68 -p1 %patch100 -p1 +%patch101 -p0 # cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE # diff --git a/httpd-2.2.15-deprecated_use_of_build_in_variable.patch b/httpd-2.2.15-deprecated_use_of_build_in_variable.patch new file mode 100644 index 0000000..db4e093 --- /dev/null +++ b/httpd-2.2.15-deprecated_use_of_build_in_variable.patch @@ -0,0 +1,21 @@ +Index: support/apxs.in +=================================================================== +--- support/apxs.in.orig ++++ support/apxs.in +@@ -83,7 +83,6 @@ sub Getopts { + my ($argumentative, @ARGV) = @_; + my $errs = 0; + local $_; +- local $[ = 0; + + my @args = split / */, $argumentative; + while (@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/) { +@@ -93,7 +92,7 @@ sub Getopts { + last; + } + my $pos = index($argumentative,$first); +- if ($pos >= $[) { ++ if ($pos >= 0) { + if ($pos < $#args && $args[$pos+1] eq ':') { + shift @ARGV; + if ($rest eq '') {