cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with pcre >= 8.30 (from upstream)

Browse Source
This commit is contained in:
ajacoutot 2012-02-17 08:33:03 +00:00
parent 93a2858850
commit 609acea29b
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/apache-httpd/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.28 2011/09/01 13:40:09 giovanni Exp $
# $OpenBSD: Makefile,v 1.29 2012/02/17 08:33:03 ajacoutot Exp $
COMMENT= apache HTTP server
V= 2.2.20
PKGNAME= apache-httpd-${V}
DISTNAME= httpd-${V}
REVISION= 0
CATEGORIES= www net

16
www/apache-httpd/patches/patch-server_util_pcre_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-server_util_pcre_c,v 1.1 2012/02/17 08:33:03 ajacoutot Exp $
Fix build with pcre >= 8.30 (from upstream)
--- server/util_pcre.c.orig Thu Nov 10 16:20:05 2005
+++ server/util_pcre.c Fri Feb 17 09:27:20 2012
@@ -137,7 +137,8 @@ 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, &(preg->re_nsub));
return 0;
}