Update ap-perl to 1.31.

While here, fixes build with perl-5.14.

= 1.31 May 11, 2009

Fix static APACI build on Mac OS X. [Gozer]

Fix XSS vulnerability in Apache::Status reported by
Richard J. Brain, CVE-2009-0796
[Fred Moyer]

On Win32, mod_perl.h needs to include <malloc.h> before the perl
headers, at least when built with USE_ITHREADS
[Steve Hay]

Win32 needs PERL_SYS_INIT/PERL_SYS_TERM calls when built with
USE_ITHREADS [sic--that's different to USE_THREADS]. In fact,
they ought to be always called if they are defined
[Steve Hay]

Fix potential segfault when the environment contains
NULL values [Mike Schilli]

Fix static APACI build against newer apache-1.3.38+
[Gozer]

Fixed modules/regex.t test 4 on Win32
[Steve Hay]

Avoid possible segfault when PerlFreshRestart is On.
[Michael Rendell <michael@cs.mun.ca>]

Prevent segfault when running with perl >= 5.9.3
[Steve Hay]

Fix shared libary extensions on Win32 to be .dll not .so
[Nikolay Ananiev <ananiev@thegdb.com>]

Patch to mod_perl.dsp to remove /D _WINSOCK2API_ on Win32
for perl >= 5.8.6 [Steve Hay]

= 1.30 March 29, 2007

SECURITY: CVE-2007-1349 (cve.mitre.org)
fix unescaped variable interpolation in Apache::PerlRun
regular expression to prevent regex engine tampering.
reported by Alex Solovey
[Randal L. Schwartz <merlyn@stonehenge.com>, Fred Moyer <fred@redhotpenguin.com>]

sync Apache-SizeLimit with latest version from CPAN (0.91)
[Philip M. Gollucci, Philippe M. Chiasson]

Fix an Apache::(Registry|PerlRun) bug caused by special characters
in the url [kolya@mail.ru]

Display a more verbose message if Apache.pm can't be loaded
[Geoffrey Young]

Fix incorrect win32 detection in Apache::SizeLimit reported by
Matt Phillips <mphillips@virage.com> [Philippe M. Chiasson]

The print-a-scalar-reference feature is now deprecated and documented
as such [Stas]

fix "PerlSetVar Foo 0" so that $r->dir_config('Foo') returns 0, not undef
[Geoffrey Young]

for some reason .pm files during the modperl build see $ENV{PERL5LIB}
set in Makefile.PL, which is used for generating Makefiles, as
"PERL5LIB=/path:/another/path" instead of "/path:/another/path"
essentially rendering this env var useless. I'm not sure why, may be
MakeMaker kicks in somewhere. Trying to workaround by
s/PERL5LIB/PERL5LIB_ENV/, using anything that's not PERL5LIB. [Stas]

change $INC{$key} = undef; to delete $INC{$key}; in PerlFreshRestart
[Geoffrey Young]

Fix a bug in Makefile.PL for Win32 where it would, in
certain cases, pick up the wrong Perl include directory
[Steve Hay]

8 files changed, 79 insertions, 51 deletions

diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index ca4ee301e96..70f3d839a74 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2011/08/14 16:05:39 obache Exp $
+# $NetBSD: Makefile,v 1.49 2011/09/21 14:59:32 obache Exp $
 #
 
-DISTNAME=		mod_perl-1.29
-PKGNAME=		ap13-perl-1.29
-PKGREVISION=		4
+DISTNAME=		mod_perl-1.31
+PKGNAME=		ap13-perl-1.31
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Apache/} \
 			http://perl.apache.org/dist/
@@ -11,6 +10,7 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Apache/} \
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://perl.apache.org/
 COMMENT=		Module that embeds a Perl interpreter into Apache
+LICENSE=		apache-1.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/ap-perl/distinfo b/www/ap-perl/distinfo
index fc5fe9cdc3a..a8aa7d00d1f 100644
--- a/www/ap-perl/distinfo
+++ b/www/ap-perl/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.12 2010/02/16 15:04:56 joerg Exp $
+$NetBSD: distinfo,v 1.13 2011/09/21 14:59:32 obache Exp $
 
-SHA1 (mod_perl-1.29.tar.gz) = 6cdc30b5bc6db26997a18da02570bd2822cdf956
-RMD160 (mod_perl-1.29.tar.gz) = 4a6eb2223f0bdedf1608bac2dbba543475fed42b
-Size (mod_perl-1.29.tar.gz) = 378877 bytes
-SHA1 (patch-aa) = 4cad52040fc391b1e562342efab7d4f380f6c14d
+SHA1 (mod_perl-1.31.tar.gz) = 5f6eadf2b0fc24ed4376d7708226391baa14c73f
+RMD160 (mod_perl-1.31.tar.gz) = 296bd5e95018c313bab84ae7b21ae9f64bd4a394
+Size (mod_perl-1.31.tar.gz) = 389960 bytes
+SHA1 (patch-Symbol_Symbol.xs) = 7a8b29c987d439f8309656936cd0377263a719fd
+SHA1 (patch-aa) = 85f4a3171f8a91eb9e77d4b2ed424ada970c377c
 SHA1 (patch-ab) = 18b02747ae4b9ab17ce252cf003bf9fd7e4b2560
-SHA1 (patch-ac) = acdc9722b1564421311788f718e3bf57f0715233
+SHA1 (patch-src_modules_perl_Log.xs) = 60c7473fac429a4aeeb60c8670dcdcb0f9cb80be
+SHA1 (patch-src_modules_perl_mod__perl.c) = 3c2e82fb91d4a470e7f018a92b330eac4c7b0630
+SHA1 (patch-src_modules_perl_perl__config.c) = daa30ae219bce44c0763ec84f64cef79989651a4
diff --git a/www/ap-perl/patches/patch-Symbol_Symbol.xs b/www/ap-perl/patches/patch-Symbol_Symbol.xs
new file mode 100644
index 00000000000..cc3ad5fa9da
--- /dev/null
+++ b/www/ap-perl/patches/patch-Symbol_Symbol.xs
@@ -0,0 +1,15 @@
+$NetBSD: patch-Symbol_Symbol.xs,v 1.1 2011/09/21 14:59:32 obache Exp $
+
+* fixes build with perl-5.14.
+
+--- Symbol/Symbol.xs.orig	2000-12-22 06:02:32.000000000 +0000
++++ Symbol/Symbol.xs
+@@ -30,7 +30,7 @@ static void undef(SV *ref)
+ 	    has_proto = TRUE;
+ 
+ 	cv_undef(cv);
+-	CvGV(cv) = gv;   /* let user-undef'd sub keep its identity */
++	CvGV_set(cv, gv);   /* let user-undef'd sub keep its identity */
+         if(has_proto) 
+             SvPOK_on(cv); /* otherwise we get `Prototype mismatch:' */
+ 
diff --git a/www/ap-perl/patches/patch-aa b/www/ap-perl/patches/patch-aa
index 92ed70a4bfa..695b2e672b9 100644
--- a/www/ap-perl/patches/patch-aa
+++ b/www/ap-perl/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.8 2010/02/16 15:04:56 joerg Exp $
+$NetBSD: patch-aa,v 1.9 2011/09/21 14:59:32 obache Exp $
 
---- apaci/Makefile.tmpl.orig	Tue Nov 24 11:38:52 1998
-+++ apaci/Makefile.tmpl	Fri Apr 30 20:36:05 1999
-@@ -94,7 +94,8 @@
+--- apaci/Makefile.tmpl.orig	2008-02-26 08:43:35.000000000 +0000
++++ apaci/Makefile.tmpl
+@@ -94,7 +94,8 @@ distclean: clean
  
  #   FOR STAND-ALONE BUILDING ONLY
  install:
--	$(APXS) -i -a -n perl libperl.so
+-	$(APXS) -i -a -n perl libperl.$(LIBEXT)
 +	#@cp libperl.so mod_perl.so
-+	#$(APXS) -i -n perl mod_perl.so
++	#$(APXS) -i -n perl libperl.$(LIBEXT)
  
  depend:
  	cp Makefile.tmpl Makefile.tmpl.bak \
diff --git a/www/ap-perl/patches/patch-ac b/www/ap-perl/patches/patch-ac
deleted file mode 100644
index 9135ff084fa..00000000000
--- a/www/ap-perl/patches/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/06/15 17:42:04 he Exp $
-
-This is revision 761081 from
-http://svn.apache.org/viewvc/perl/modperl/branches/1.x/lib/Apache/Status.pm?view=log&pathrev=761081
-Fixes an XSS bug in Apache::Status, ref. CVE-2009-0796.
-
---- lib/Apache/Status.pm.orig	2005/05/23 01:08:52	177851
-+++ lib/Apache/Status.pm	2009/04/01 21:57:52	761081
-@@ -72,7 +72,7 @@
- 	$r->print(symdump($r, $newQ->($r), $qs));
-     }
-     else {
--	my $uri = $r->uri;
-+	my $uri = $r->location;
- 	$r->print(
-  	    map { qq[<a href="$uri?$_">$status{$_}</a><br>\n] } keys %status
-         );
-@@ -140,7 +140,7 @@
- sub status_inc {
-     my($r,$q) = @_;
-     my(@retval, $module, $v, $file);
--    my $uri = $r->uri;
-+    my $uri = $r->location;
-     push @retval, "<table border=1>";
-     push @retval, 
-     "<tr>", 
-@@ -198,7 +198,7 @@
-     my($r,$q) = @_;
-     my(@retval);
-     local $_;
--    my $uri = $r->uri;
-+    my $uri = $r->location;
-     my $cache = __PACKAGE__->registry_cache;
-     push @retval, "<b>Click on package name to see its symbol table</b><p>\n";
-     foreach (sort keys %$cache) {
diff --git a/www/ap-perl/patches/patch-src_modules_perl_Log.xs b/www/ap-perl/patches/patch-src_modules_perl_Log.xs
new file mode 100644
index 00000000000..4fd8d2fa5fe
--- /dev/null
+++ b/www/ap-perl/patches/patch-src_modules_perl_Log.xs
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_modules_perl_Log.xs,v 1.1 2011/09/21 14:59:32 obache Exp $
+
+* fixes build with perl-5.14.
+
+--- src/modules/perl/Log.xs.orig	2001-01-25 07:43:05.000000000 +0000
++++ src/modules/perl/Log.xs
+@@ -10,7 +10,7 @@
+ static void perl_cv_alias(char *to, char *from)
+ {
+     GV *gp = gv_fetchpv(to, TRUE, SVt_PVCV);
+-    GvCV(gp) = perl_get_cv(from, TRUE);
++    GvCV_set(gp, perl_get_cv(from, TRUE));
+ }
+ 
+ static void ApacheLog(int level, SV *sv, SV *msg)
diff --git a/www/ap-perl/patches/patch-src_modules_perl_mod__perl.c b/www/ap-perl/patches/patch-src_modules_perl_mod__perl.c
new file mode 100644
index 00000000000..4352b68868d
--- /dev/null
+++ b/www/ap-perl/patches/patch-src_modules_perl_mod__perl.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_modules_perl_mod__perl.c,v 1.1 2011/09/21 14:59:32 obache Exp $
+
+* fixes build with perl-5.14.
+
+--- src/modules/perl/mod_perl.c.orig	2008-11-20 18:12:31.000000000 +0000
++++ src/modules/perl/mod_perl.c
+@@ -785,7 +785,7 @@ void perl_startup (server_rec *s, pool *
+     /* *CORE::GLOBAL::exit = \&Apache::exit */
+     if(gv_stashpv("CORE::GLOBAL", FALSE)) {
+ 	GV *exitgp = gv_fetchpv("CORE::GLOBAL::exit", TRUE, SVt_PVCV);
+-	GvCV(exitgp) = perl_get_cv("Apache::exit", TRUE);
++	GvCV_set(exitgp, perl_get_cv("Apache::exit", TRUE));
+ 	GvIMPORTED_CV_on(exitgp);
+     }
+ 
diff --git a/www/ap-perl/patches/patch-src_modules_perl_perl__config.c b/www/ap-perl/patches/patch-src_modules_perl_perl__config.c
new file mode 100644
index 00000000000..d51070384fa
--- /dev/null
+++ b/www/ap-perl/patches/patch-src_modules_perl_perl__config.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_modules_perl_perl__config.c,v 1.1 2011/09/21 14:59:32 obache Exp $
+
+* fixes build with perl-5.14.
+
+--- src/modules/perl/perl_config.c.orig	2003-03-14 04:55:59.000000000 +0000
++++ src/modules/perl/perl_config.c
+@@ -1720,7 +1720,7 @@ void perl_clear_symtab(HV *symtab) 
+ 	if((cv = GvCV((GV*)val)) && (GvSTASH((GV*)val) == GvSTASH(CvGV(cv)))) {
+             GV *gv = CvGV(cv);
+             cv_undef(cv);
+-            CvGV(cv) = gv;
++            CvGV_set(cv, gv);
+             GvCVGEN(gv) = 1; /* invalidate method cache */
+         }
+     }