diff options
| author | spz <spz> | 2009-06-07 20:25:00 +0000 |
|---|---|---|
| committer | spz <spz> | 2009-06-07 20:25:00 +0000 |
| commit | d1580162db26d53430eb270554cfb5eef4ca529a (patch) | |
| tree | 068710f0eee5d4770dd482e5d7a090e775064084 /www/ap2-perl/patches | |
| parent | 656e29665139d233b36d2eff0e3f81c91918e40b (diff) | |
| download | pkgsrc-d1580162db26d53430eb270554cfb5eef4ca529a.tar.gz | |
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.
Diffstat (limited to 'www/ap2-perl/patches')
| -rw-r--r-- | www/ap2-perl/patches/patch-ab | 14 | ||||
| -rw-r--r-- | www/ap2-perl/patches/patch-ac | 22 |
2 files changed, 36 insertions, 0 deletions
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 */ |