diff options
| author | spz <spz> | 2009-06-12 20:54:22 +0000 |
|---|---|---|
| committer | spz <spz> | 2009-06-12 20:54:22 +0000 |
| commit | 51ae64b98cfa538992455ea42b9e9609113f799b (patch) | |
| tree | afdbb62a2cbb46e38dd00da61f8366e15591e740 /www/ap2-perl/patches | |
| parent | b5d6d088b92637f734a04b83c010b419648cbe97 (diff) | |
| download | pkgsrc-51ae64b98cfa538992455ea42b9e9609113f799b.tar.gz | |
revert previous commit: apache22 was fixed to provide backwards compat
for its dependents, so the removed patches are no longer necessary.
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, 0 insertions, 36 deletions
diff --git a/www/ap2-perl/patches/patch-ab b/www/ap2-perl/patches/patch-ab deleted file mode 100644 index 0cbe51cc3ba..00000000000 --- a/www/ap2-perl/patches/patch-ab +++ /dev/null @@ -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"); -+ } - - ("", ""); - } diff --git a/www/ap2-perl/patches/patch-ac b/www/ap2-perl/patches/patch-ac deleted file mode 100644 index 735d5218b50..00000000000 --- a/www/ap2-perl/patches/patch-ac +++ /dev/null @@ -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 */ |