diff --git a/apache2.changes b/apache2.changes index 7f06909..6a525c9 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -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 493c692..4fab696 100644 --- a/apache2.spec +++ b/apache2.spec @@ -120,8 +120,6 @@ 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 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 deleted file mode 100644 index db4e093..0000000 --- a/httpd-2.2.15-deprecated_use_of_build_in_variable.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 '') {