kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

revert previous commit: apache22 was fixed to provide backwards compat

Browse source 
for its dependents, so the removed patches are no longer necessary.
This commit is contained in:
spz 2009-06-12 20:54:22 +00:00
parent 0e50bc7399
commit a0f6b5a7eb
4 changed files with 3 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
www/ap2-perl/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.32 2009/06/07 20:25:00 spz Exp $
# $NetBSD: Makefile,v 1.33 2009/06/12 20:54:22 spz Exp $
DISTNAME= mod_perl-2.0.4
PKGREVISION= 3
PKGREVISION= 4
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
CATEGORIES= www perl5
MASTER_SITES= http://perl.apache.org/dist/

4
www/ap2-perl/distinfo
View file

@ -1,7 +1,5 @@
$NetBSD: distinfo,v 1.11 2009/06/07 20:25:00 spz Exp $
$NetBSD: distinfo,v 1.12 2009/06/12 20:54:22 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

14
www/ap2-perl/patches/patch-ab
View file

@ -1,14 +0,0 @@
$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");
+ }
("", "");
}

22
www/ap2-perl/patches/patch-ac
View file

@ -1,22 +0,0 @@
$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 */