From 47abd4db5b9bb8af39597d694735bcd891105ce5b3d89913d105e17976339f85 Mon Sep 17 00:00:00 2001 From: Roman Drahtmueller Date: Tue, 11 May 2010 23:24:40 +0000 Subject: [PATCH 1/3] Accepting request 39833 from home:lrupp:branches:Apache Copy from home:lrupp:branches:Apache/apache2 via accept of submit request 39833 revision 3. Request was accepted with message: Cool. THX. :-) OBS-URL: https://build.opensuse.org/request/show/39833 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=314 --- apache2.changes | 6 ++++++ apache2.spec | 2 ++ ...-deprecated_use_of_build_in_variable.patch | 21 +++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 httpd-2.2.15-deprecated_use_of_build_in_variable.patch 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..493c692 100644 --- a/apache2.spec +++ b/apache2.spec @@ -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 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 '') { From c24bb91de921fea86619eccf7a7e3e51132bcfff43d52563ee426f18e71e0446 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 12 May 2010 08:47:28 +0000 Subject: [PATCH 2/3] Accepting request 39834 from Apache checked in (request 39834) OBS-URL: https://build.opensuse.org/request/show/39834 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=315 --- apache2.changes | 6 ------ apache2.spec | 2 -- ...-deprecated_use_of_build_in_variable.patch | 21 ------------------- 3 files changed, 29 deletions(-) delete mode 100644 httpd-2.2.15-deprecated_use_of_build_in_variable.patch 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 '') { From 43c955beef0612cb27b38e348974e97aff1feefb051941855a09aa7f890e81a2 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 12 May 2010 08:47:29 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/apache2 revision 41.0 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=cfcefd03ea0dedd79a1df42f3e5912c1 --- apache2.changes | 6 ++++++ apache2.spec | 5 ++++- ...-deprecated_use_of_build_in_variable.patch | 21 +++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 httpd-2.2.15-deprecated_use_of_build_in_variable.patch 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 '') {