[pkgsrc/trunk]: pkgsrc/www/ap-perl Update from version 1.29nb1 to 1.29nb2.

[he <he%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ac1017847a6e
branches:  trunk
changeset: 394791:ac1017847a6e
user:      he <he%pkgsrc.org@localhost>
date:      Mon Jun 15 17:42:04 2009 +0000

description:
Update from version 1.29nb1 to 1.29nb2.

Pkgsrc changes:
 o Apply fix from svn repository to fix an XSS bug in Apache::Status,
   ref. CVE-2009-0796.

diffstat:

 www/ap-perl/Makefile         |   7 ++++---
 www/ap-perl/distinfo         |   3 ++-
 www/ap-perl/patches/patch-ac |  35 +++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)

diffs (81 lines):

diff -r edffc1f5de5f -r ac1017847a6e www/ap-perl/Makefile
--- a/www/ap-perl/Makefile      Mon Jun 15 17:38:21 2009 +0000
+++ b/www/ap-perl/Makefile      Mon Jun 15 17:42:04 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2008/10/19 19:19:01 he Exp $
+# $NetBSD: Makefile,v 1.45 2009/06/15 17:42:04 he Exp $
 #
 
 DISTNAME=              mod_perl-1.29
 PKGNAME=               ap13-perl-1.29
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            www perl5
 MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=Apache/} \
                        http://perl.apache.org/dist/
@@ -25,11 +25,12 @@
 MAKE_PARAMS+=          WITH_APXS=${APXS}
 MAKE_PARAMS+=          EVERYTHING=1
 
+INSTALLATION_DIRS+=    share/httpd/htdocs/manual/mod
+
 .include "../../lang/perl5/module.mk"
 .include "../../www/apache/buildlink3.mk"
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/httpd/htdocs/manual/mod
        ${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/mod_perl.html \
                ${PREFIX}/share/httpd/htdocs/manual/mod
 
diff -r edffc1f5de5f -r ac1017847a6e www/ap-perl/distinfo
--- a/www/ap-perl/distinfo      Mon Jun 15 17:38:21 2009 +0000
+++ b/www/ap-perl/distinfo      Mon Jun 15 17:42:04 2009 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2005/06/24 06:58:26 jlam Exp $
+$NetBSD: distinfo,v 1.11 2009/06/15 17:42:04 he 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) = dfdc20ee2ce2ffdc5a5e87b02f4946e92b43bc6d
 SHA1 (patch-ab) = 18b02747ae4b9ab17ce252cf003bf9fd7e4b2560
+SHA1 (patch-ac) = acdc9722b1564421311788f718e3bf57f0715233
diff -r edffc1f5de5f -r ac1017847a6e www/ap-perl/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/ap-perl/patches/patch-ac      Mon Jun 15 17:42:04 2009 +0000
@@ -0,0 +1,35 @@
+$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) {