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

Accepting request 129511 from home:elvigia:branches:Apache

Browse Source 
- BuildRequire xz explicitly, fix build in !Factory 
- Drop more old, unused patches

OBS-URL: https://build.opensuse.org/request/show/129511
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=371
This commit is contained in:
Cristian Rodríguez 2012-08-01 02:26:59 +00:00 committed by Git OBS Bridge
parent e249e1729b
commit 435dd9044b
4 changed files with 7 additions and 2044 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2021
apache2.2-mpm-itk-20090414-00.patch
View File

File diff suppressed because it is too large Load Diff

6
apache2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 1 02:21:34 UTC 2012 - crrodriguez@opensuse.org
- BuildRequire xz explicitly, fix build in !Factory
- Drop more old, unused patches
-------------------------------------------------------------------
Wed Aug 1 01:14:35 UTC 2012 - crrodriguez@opensuse.org

1
apache2.spec
View File

@ -25,6 +25,7 @@ BuildRequires: libapr1-devel >= 1.4.2
BuildRequires: openldap2-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: xz
BuildRequires: zlib-devel
%if %{?suse_version:1}0 && 0%{?sles_version} == 9
BuildRequires: libcap

23
httpd-new_pcre.patch
View File

@ -1,23 +0,0 @@
Index: server/util_pcre.c
===================================================================
--- server/util_pcre.c.orig 2012-02-11 10:07:31.000000000 +0100
+++ server/util_pcre.c 2012-02-11 10:08:23.062838133 +0100
@@ -128,6 +128,7 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t *p
const char *errorptr;
int erroffset;
int options = 0;
+int nsub;
if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
@@ -137,7 +138,9 @@ preg->re_erroffset = erroffset;
if (preg->re_pcre == NULL) return AP_REG_INVARG;
-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
+pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
+ PCRE_INFO_CAPTURECOUNT, &nsub);
+preg->re_nsub = nsub;
return 0;
}