rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

Updating link to change in openSUSE:Factory/apache2 revision 41.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=cfcefd03ea0dedd79a1df42f3e5912c1
This commit is contained in:
OBS User buildservice-autocommit
2010-05-12 08:47:29 +00:00
committed by Git OBS Bridge
parent c24bb91de9
commit 43c955beef
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apache2.changes
View File

@@ -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 Fri May 7 12:38:10 UTC 2010 - aj@suse.de

5
apache2.spec
View File

@@ -64,7 +64,7 @@ License: ASLv..
Group: Productivity/Networking/Web/Servers Group: Productivity/Networking/Web/Servers
%define realver 2.2.15 %define realver 2.2.15
Version: 2.2.15 Version: 2.2.15
Release: 2 Release: 3
#Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2
Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2 Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2
# Add file to take mtime from it in prep section # 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 Patch67: httpd-2.2.0-apxs-a2enmod.dif
Patch68: httpd-2.x.x-logresolve.patch Patch68: httpd-2.x.x-logresolve.patch
Patch100: apache2.2-mpm-itk-20090414-00.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/ Url: http://httpd.apache.org/
Icon: Apache.xpm Icon: Apache.xpm
Summary: The Apache Web Server Version 2.0 Summary: The Apache Web Server Version 2.0
@@ -389,6 +391,7 @@ Authors:
%patch67 -p1 %patch67 -p1
%patch68 -p1 %patch68 -p1
%patch100 -p1 %patch100 -p1
%patch101 -p0
# #
cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
# #

21
httpd-2.2.15-deprecated_use_of_build_in_variable.patch Normal file
View File

@@ -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 '') {