pool/apache2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- add Requires on libapr1 >= 1.4.2. In the past, libapr1 >= 1.0 was sufficient.

Browse Source 
But since 2.2.16, a failure to create listen sockets can occur, unless newer
  libapr1 is used. See https://bugzilla.redhat.com/show_bug.cgi?id=516331
- remove obsolete httpd-2.2.15-deprecated_use_of_build_in_variable.patch

OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=320
This commit is contained in:
Peter Poeml 2010-07-29 13:20:57 +00:00 committed by Git OBS Bridge
parent b381b109cf
commit bbd277f1ab
3 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache2.changes
View File

@ -1,5 +1,5 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 28 12:07:33 UTC 2010 - poeml@cmdline.net Thu Jul 29 13:19:23 UTC 2010 - poeml@cmdline.net
- update to 2.2.16: - update to 2.2.16:
SECURITY: CVE-2010-1452 (cve.mitre.org) SECURITY: CVE-2010-1452 (cve.mitre.org)
@ -33,6 +33,10 @@ Wed Jul 28 12:07:33 UTC 2010 - poeml@cmdline.net
mod_rewrite: mod_rewrite:
- Allow to set environment variables without explicitely - Allow to set environment variables without explicitely
giving a value. giving a value.
- add Requires on libapr1 >= 1.4.2. In the past, libapr1 >= 1.0 was sufficient.
But since 2.2.16, a failure to create listen sockets can occur, unless newer
libapr1 is used. See https://bugzilla.redhat.com/show_bug.cgi?id=516331
- remove obsolete httpd-2.2.15-deprecated_use_of_build_in_variable.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 17 14:33:47 UTC 2010 - poeml@cmdline.net Mon May 17 14:33:47 UTC 2010 - poeml@cmdline.net

8
apache2.spec
View File

@ -120,8 +120,6 @@ 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
@ -130,7 +128,10 @@ Provides: httpd http_daemon %{apache_mmn} suse_help_viewer
Requires: %{pname}-MPM /etc/mime.types Requires: %{pname}-MPM /etc/mime.types
PreReq: %{name}-utils PreReq: %{name}-utils
Requires: logrotate Requires: logrotate
Requires: libapr1 >= 1.0 # in the past, libapr1 >= 1.0 was sufficient. But since 2.2.16, a failure to
# create listen sockets can occur, unless newer libapr1 is used.
# see https://bugzilla.redhat.com/show_bug.cgi?id=516331
Requires: libapr1 >= 1.4.2
Requires: libapr1 < 2.0 Requires: libapr1 < 2.0
PreReq: fileutils textutils grep sed PreReq: fileutils textutils grep sed
%if %{?suse_version:1}0 %if %{?suse_version:1}0
@ -341,7 +342,6 @@ to administrators of web servers in general.
%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
View File

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