diff options
| author | he <he@pkgsrc.org> | 2009-06-15 17:38:21 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2009-06-15 17:38:21 +0000 |
| commit | a912111a7caae0c88f3be2e9dd301ecff06e6abd (patch) | |
| tree | 2270774d5063f06ef1fc572a783b5f6285a22076 /www/ap2-perl | |
| parent | 25e0a7666fb8d94f979ee25cabb2d35563692cec (diff) | |
| download | pkgsrc-a912111a7caae0c88f3be2e9dd301ecff06e6abd.tar.gz | |
Update from version 2.04nb4 to 2.04nb5.
Pkgsrc changes:
o Apply fix from svn repository to fix an XSS bug in Apache2::Status,
ref. CVE-2009-0796.
Diffstat (limited to 'www/ap2-perl')
| -rw-r--r-- | www/ap2-perl/Makefile | 6 | ||||
| -rw-r--r-- | www/ap2-perl/distinfo | 3 | ||||
| -rw-r--r-- | www/ap2-perl/patches/patch-aa | 53 |
3 files changed, 58 insertions, 4 deletions
diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile index ec5ab55c801..19dfc71520d 100644 --- a/www/ap2-perl/Makefile +++ b/www/ap2-perl/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2009/06/12 20:54:22 spz Exp $ +# $NetBSD: Makefile,v 1.34 2009/06/15 17:38:21 he Exp $ DISTNAME= mod_perl-2.0.4 -PKGREVISION= 4 +PKGREVISION= 5 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} CATEGORIES= www perl5 MASTER_SITES= http://perl.apache.org/dist/ @@ -16,7 +16,7 @@ CONFLICTS= ap-perl-[0-9]* p5-Apache-Test-[0-9]* PKG_APACHE_ACCEPTED= apache2 apache22 -APACHE_MODULE= # defined +APACHE_MODULE= # empty PERL5_PACKLIST= auto/mod_perl2/.packlist MAKE_PARAMS+= MP_APXS=${APXS} diff --git a/www/ap2-perl/distinfo b/www/ap2-perl/distinfo index 8a7ce523607..e69d981f7d8 100644 --- a/www/ap2-perl/distinfo +++ b/www/ap2-perl/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.12 2009/06/12 20:54:22 spz Exp $ +$NetBSD: distinfo,v 1.13 2009/06/15 17:38:21 he 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-aa) = 1aba55afc0adfc3a1fe7a694099e09584d2979b0 diff --git a/www/ap2-perl/patches/patch-aa b/www/ap2-perl/patches/patch-aa new file mode 100644 index 00000000000..74b5750aeaa --- /dev/null +++ b/www/ap2-perl/patches/patch-aa @@ -0,0 +1,53 @@ +$NetBSD: patch-aa,v 1.3 2009/06/15 17:38:21 he Exp $ + +This is revision 760926 from modperl's svn repository: +http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/Status.pm?view=log&pathrev=761081 +Fix an XSS bug in Apache2::Status, ref. CVE-2009-0796. + +--- lib/Apache2/Status.pm.orig 2007/12/31 08:05:11 607697 ++++ lib/Apache2/Status.pm 2009/04/01 15:39:56 760926 +@@ -29,7 +29,7 @@ + + use Apache2::Const -compile => qw(OK); + +-$Apache2::Status::VERSION = '4.00'; # mod_perl 2.0 ++$Apache2::Status::VERSION = '4.01'; # mod_perl 2.0 + + use constant IS_WIN32 => ($^O eq "MSWin32"); + +@@ -126,7 +126,7 @@ + $r->print(symdump($r, $qs)); + } + else { +- my $uri = $r->uri; ++ my $uri = $r->location; + $r->print('<p>'); + $r->print( + map { qq[<a href="$uri?$_">$status{$_}</a><br />\n] } sort { lc $a cmp lc $b } keys %status +@@ -198,7 +198,7 @@ + sub status_inc { + my ($r) = @_; + +- my $uri = $r->uri; ++ my $uri = $r->location; + my @retval = ( + '<table border="1">', + "<tr>", +@@ -289,7 +289,7 @@ + my ($r) = @_; + + local $_; +- my $uri = $r->uri; ++ my $uri = $r->location; + my $cache = __PACKAGE__->registry_cache; + + my @retval = "<h2>Compiled registry scripts grouped by their handler</h2>"; +@@ -765,7 +765,7 @@ + my ($self, $package, $r) = @_; + + my @m = qw(<table>); +- my $uri = $r->uri; ++ my $uri = $r->location; + my $is_main = $package eq "main"; + + my $do_dump = has($r, "dumper"); |