diff options
| author | tron <tron@pkgsrc.org> | 2014-05-30 10:57:44 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2014-05-30 10:57:44 +0000 |
| commit | ea70b552d0d6758d25cb33e92015733a6f026c76 (patch) | |
| tree | eedc019e3027267cb37130eafb36d1b8af17e358 | |
| parent | 1ac6a85bde9fa0877c22f18bbab5551809f72f38 (diff) | |
| download | pkgsrc-ea70b552d0d6758d25cb33e92015733a6f026c76.tar.gz | |
Make "automake" work with Perl 5.20.0.
Bump package revision because of this fix.
| -rw-r--r-- | devel/automake14/Makefile | 4 | ||||
| -rw-r--r-- | devel/automake14/distinfo | 4 | ||||
| -rw-r--r-- | devel/automake14/patches/patch-ac | 26 |
3 files changed, 27 insertions, 7 deletions
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile index 0e6a8ff23a3..87ade7cace6 100644 --- a/devel/automake14/Makefile +++ b/devel/automake14/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2014/05/29 23:35:34 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2014/05/30 10:57:44 tron Exp $ DISTNAME= automake-1.4-p6 PKGNAME= automake14-1.4.6 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=automake/} diff --git a/devel/automake14/distinfo b/devel/automake14/distinfo index e4a33f4d9c9..210a6696732 100644 --- a/devel/automake14/distinfo +++ b/devel/automake14/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2011/06/10 09:43:41 tron Exp $ +$NetBSD: distinfo,v 1.6 2014/05/30 10:57:44 tron Exp $ SHA1 (automake-1.4-p6.tar.gz) = 330c75c98e6dcdf21cbb63cf94ced8ea564b9438 RMD160 (automake-1.4-p6.tar.gz) = ae40b2200eec95b601ebc65bc3cc916bb2a54066 Size (automake-1.4-p6.tar.gz) = 375060 bytes SHA1 (patch-aa) = e5e7f073a777be92f419173c9cc84dc42325a3a1 SHA1 (patch-ab) = b074d0139e0b36f19a71304e739ea5b7f332fcc6 -SHA1 (patch-ac) = 3e9800a8592c6dfd56311ab6e3066066cb5bc46f +SHA1 (patch-ac) = bb6ce6621d5c93fd4a0bbcea7ce0f5292d451c42 diff --git a/devel/automake14/patches/patch-ac b/devel/automake14/patches/patch-ac index 594f1c5d36a..0a27793e405 100644 --- a/devel/automake14/patches/patch-ac +++ b/devel/automake14/patches/patch-ac @@ -1,11 +1,31 @@ -$NetBSD: patch-ac,v 1.1 2011/06/10 09:43:41 tron Exp $ +$NetBSD: patch-ac,v 1.2 2014/05/30 10:57:44 tron Exp $ -Fix for CVE-2009-4029 taken from here: +1.) Fix for CVE-2009-4029 taken from here: http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=449d20aa12e13fefd848604225fc83d0c39c61d0 +2.) Make this work with Perl 5.20.0 and newer. + --- automake.in.orig 2002-07-27 21:55:58.000000000 +0100 -+++ automake.in 2011-06-10 10:34:37.000000000 +0100 ++++ automake.in 2014-05-30 11:50:32.000000000 +0100 +@@ -983,7 +983,7 @@ + + # Compute the function name of the finisher and then call it. + $name = 'lang_' . $lang . '_finish'; +- do $name (); ++ eval "$name()"; + } + + # If the project is entirely C++ or entirely Fortran 77, don't +@@ -1144,7 +1144,7 @@ + # Found the language, so see what it says. + local ($subr) = 'lang_' . $lang . '_rewrite'; + # Note: computed subr call. +- local ($r) = do $subr ($base, $extension); ++ local ($r) = eval "$subr(\$base, \$extension)"; + # Skip this entry if we were asked not to process it. + next if ! $r; + @@ -2336,7 +2336,7 @@ # Create dist directory. $output_rules .= ("\t-rm -rf \$(distdir)\n" |