diff options
author | spz <spz> | 2012-12-12 10:13:47 +0000 |
---|---|---|
committer | spz <spz> | 2012-12-12 10:13:47 +0000 |
commit | bdbeb05ae35c8e15d0b14ef48675939c6bfc5b2d (patch) | |
tree | 27adad4194cf8950b58991735bae92ef7ff46395 | |
parent | a0b6b30aafa95103c8c8cebc26a130cdae77f901 (diff) | |
download | pkgsrc-bdbeb05ae35c8e15d0b14ef48675939c6bfc5b2d.tar.gz |
patch SA51498 from the git repo
-rw-r--r-- | lang/perl5/Makefile | 3 | ||||
-rw-r--r-- | lang/perl5/distinfo | 3 | ||||
-rw-r--r-- | lang/perl5/patches/patch-dist_Locale-Maketext_lib_Locale_Maketext.pm | 53 |
3 files changed, 57 insertions, 2 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index 3df227cbddc..135fbd4d5f9 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.191 2012/11/07 03:58:00 sbd Exp $ +# $NetBSD: Makefile,v 1.192 2012/12/12 10:13:47 spz Exp $ .include "license.mk" .include "Makefile.common" COMMENT= Practical Extraction and Report Language +PKGREVISION= 1 CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \ p5-CGI-2.66{,nb*} p5-CGI-2.75{,nb*} p5-CGI-2.75.[0-2] \ diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index 6bc5e0a4ad2..09924099ffe 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.88 2012/11/04 10:31:46 adam Exp $ +$NetBSD: distinfo,v 1.89 2012/12/12 10:13:47 spz Exp $ SHA1 (perl-5.16.2.tar.gz) = 9e20e38e3460ebbac895341fd70a02189d03a490 RMD160 (perl-5.16.2.tar.gz) = 84f0233ac48059b4636661b023dd8a3389f9ae64 @@ -14,6 +14,7 @@ SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7 SHA1 (patch-cp) = 0b22d334df24d128142855464bf6dd61d4d82975 SHA1 (patch-cpan_Sys-Syslog_Syslog.xs) = 4413010d0b55a0ae636bca8ff3ace2ebc99e90ba +SHA1 (patch-dist_Locale-Maketext_lib_Locale_Maketext.pm) = d44647f32d356030c8c2cd6346559f613a7fe459 SHA1 (patch-hints_solaris_2.sh) = 26f804234c07da04ebd6c33ce7ad54d94c746f1e SHA1 (patch-ta) = 51a3e02148e78eaab882125f859e59add39a4fbe SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f diff --git a/lang/perl5/patches/patch-dist_Locale-Maketext_lib_Locale_Maketext.pm b/lang/perl5/patches/patch-dist_Locale-Maketext_lib_Locale_Maketext.pm new file mode 100644 index 00000000000..ac0eb9f446a --- /dev/null +++ b/lang/perl5/patches/patch-dist_Locale-Maketext_lib_Locale_Maketext.pm @@ -0,0 +1,53 @@ +$NetBSD: patch-dist_Locale-Maketext_lib_Locale_Maketext.pm,v 1.1 2012/12/12 10:13:47 spz Exp $ + +patch for SA51498 taken from: +http://perl5.git.perl.org/perl.git/commitdiff/1735f6f53ca19f99c6e9e39496c486af323ba6a8?hp=569ba91fcdabdc53eb4284f860a25273bd7fe4e1 + +--- dist/Locale-Maketext/lib/Locale/Maketext.pm.orig 2012-10-11 18:20:45.000000000 +0000 ++++ dist/Locale-Maketext/lib/Locale/Maketext.pm 2012-12-12 09:26:29.000000000 +0000 +@@ -625,21 +625,9 @@ sub _compile { + # 0-length method name means to just interpolate: + push @code, ' ('; + } +- elsif($m =~ /^\w+(?:\:\:\w+)*$/s +- and $m !~ m/(?:^|\:)\d/s +- # exclude starting a (sub)package or symbol with a digit ++ elsif($m =~ /^\w+$/s ++ # exclude anything fancy, especially fully-qualified module names + ) { +- # Yes, it even supports the demented (and undocumented?) +- # $obj->Foo::bar(...) syntax. +- $target->_die_pointing( +- $string_to_compile, q{Can't use "SUPER::" in a bracket-group method}, +- 2 + length($c[-1]) +- ) +- if $m =~ m/^SUPER::/s; +- # Because for SUPER:: to work, we'd have to compile this into +- # the right package, and that seems just not worth the bother, +- # unless someone convinces me otherwise. +- + push @code, ' $_[0]->' . $m . '('; + } + else { +@@ -693,7 +681,9 @@ sub _compile { + elsif(substr($1,0,1) ne '~') { + # it's stuff not containing "~" or "[" or "]" + # i.e., a literal blob +- $c[-1] .= $1; ++ my $text = $1; ++ $text =~ s/\\/\\\\/g; ++ $c[-1] .= $text; + + } + elsif($1 eq '~~') { # "~~" +@@ -731,7 +721,9 @@ sub _compile { + else { + # It's a "~X" where X is not a special character. + # Consider it a literal ~ and X. +- $c[-1] .= $1; ++ my $text = $1; ++ $text =~ s/\\/\\\\/g; ++ $c[-1] .= $text; + } + } + } |