The recent security patch to www/apache22 removed OPT_INCNOEXEC.

This in turn makes the build of ap2-perl with apache22 fail.
The patches committed here make ap2-perl build again.
They may not be sufficient to actually use the package in earnest, though.

4 files changed, 41 insertions, 3 deletions

diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile
index 874f8970ffa..03a6cff1720 100644
--- a/www/ap2-perl/Makefile
+++ b/www/ap2-perl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2008/10/19 19:19:01 he Exp $
+# $NetBSD: Makefile,v 1.32 2009/06/07 20:25:00 spz Exp $
 
 DISTNAME=	mod_perl-2.0.4
-PKGREVISION=	2
+PKGREVISION=	3
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
 CATEGORIES=	www perl5
 MASTER_SITES=	http://perl.apache.org/dist/
diff --git a/www/ap2-perl/distinfo b/www/ap2-perl/distinfo
index 987c2fa6bab..61bd230f567 100644
--- a/www/ap2-perl/distinfo
+++ b/www/ap2-perl/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.10 2008/04/23 20:36:41 wiz Exp $
+$NetBSD: distinfo,v 1.11 2009/06/07 20:25:00 spz Exp $
 
 SHA1 (mod_perl-2.0.4.tar.gz) = 65299a16ec414a690a48a2bbe63acaa3c6bb897b
 RMD160 (mod_perl-2.0.4.tar.gz) = 111b8f33e2dcc43ef7a0a7d557ceb467f0c55c6d
 Size (mod_perl-2.0.4.tar.gz) = 3727717 bytes
+SHA1 (patch-ab) = 2a96a0e18f84f940c544c3cb160862e69a93b48d
+SHA1 (patch-ac) = 75691f6d861e7066b5c13cda1aed2383ce574cea
diff --git a/www/ap2-perl/patches/patch-ab b/www/ap2-perl/patches/patch-ab
new file mode 100644
index 00000000000..0cbe51cc3ba
--- /dev/null
+++ b/www/ap2-perl/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2009/06/07 20:25:00 spz Exp $
+
+--- ./lib/ModPerl/Code.pm.orig	2007-12-31 07:50:47.000000000 +0000
++++ ./lib/ModPerl/Code.pm
+@@ -833,6 +833,9 @@ sub constants_ifdef {
+     if ($ifdef{$name}) {
+         return ("#ifdef $name\n", "#endif /* $name */\n");
+     }
++    if ($name =~ /OPT_INCNOEXEC/) {
++	return ("#if AP_SERVER_MAJORVERSION_NUMBER==2 && AP_SERVER_MINORVERSION_NUMBER<2\n", "#endif /* AP version < 2.2 */\n");
++    }
+ 
+     ("", "");
+ }
diff --git a/www/ap2-perl/patches/patch-ac b/www/ap2-perl/patches/patch-ac
new file mode 100644
index 00000000000..735d5218b50
--- /dev/null
+++ b/www/ap2-perl/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2009/06/07 20:25:00 spz Exp $
+
+--- src/modules/perl/modperl_apache_compat.h.orig	2007-12-31 07:23:36.000000000 +0000
++++ src/modules/perl/modperl_apache_compat.h
+@@ -65,10 +65,17 @@ AP_DECLARE(const char *) ap_get_server_v
+ #define MP_HTTPD_OVERRIDE_HTACCESS (OR_LIMIT|OR_OPTIONS|OR_FILEINFO|OR_AUTHCFG|OR_INDEXES)
+ 
+ #define MP_HTTPD_OVERRIDE_OPTS_UNSET (-1)
++#if AP_SERVER_MAJORVERSION_NUMBER==2 && AP_SERVER_MINORVERSION_NUMBER<2
+ #define MP_HTTPD_OVERRIDE_OPTS_DEFAULT (OPT_UNSET | \
+                                         OPT_ALL | \
+                                         OPT_INCNOEXEC | \
+                                         OPT_SYM_OWNER | \
+                                         OPT_MULTI)
++#else
++#define MP_HTTPD_OVERRIDE_OPTS_DEFAULT (OPT_UNSET | \
++                                        OPT_ALL | \
++                                        OPT_SYM_OWNER | \
++                                        OPT_MULTI)
++#endif
+ 
+ #endif /* MODPERL_APACHE_COMPAT_H */