Fri May 30 10:57:45 2014 UTC ()
Make "automake" work with Perl 5.20.0.

Bump package revision because of this fix.


(tron)
diff -r1.24 -r1.25 pkgsrc/devel/automake14/Makefile
diff -r1.5 -r1.6 pkgsrc/devel/automake14/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/automake14/patches/patch-ac
cvs diff -r1.24 -r1.25 pkgsrc/devel/automake14/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/automake14/Makefile 2014/05/29 23:35:34 1.24
+++ pkgsrc/devel/automake14/Makefile 2014/05/30 10:57:44 1.25
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.24 2014/05/29 23:35:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.25 2014/05/30 10:57:44 tron Exp $
2 2
3DISTNAME= automake-1.4-p6 3DISTNAME= automake-1.4-p6
4PKGNAME= automake14-1.4.6 4PKGNAME= automake14-1.4.6
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_GNU:=automake/} 7MASTER_SITES= ${MASTER_SITE_GNU:=automake/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnu.org/software/automake/automake.html 10HOMEPAGE= http://www.gnu.org/software/automake/automake.html
11COMMENT= GNU Standards-compliant Makefile generator (old version) 11COMMENT= GNU Standards-compliant Makefile generator (old version)
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= autoconf213>=2.13:../../devel/autoconf213 14DEPENDS+= autoconf213>=2.13:../../devel/autoconf213
15 15
16CONFLICTS= automake<1.6 16CONFLICTS= automake<1.6
17 17
18#PKG_INSTALLATION_TYPES= overwrite pkgviews 18#PKG_INSTALLATION_TYPES= overwrite pkgviews
cvs diff -r1.5 -r1.6 pkgsrc/devel/automake14/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/automake14/distinfo 2011/06/10 09:43:41 1.5
+++ pkgsrc/devel/automake14/distinfo 2014/05/30 10:57:44 1.6
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.5 2011/06/10 09:43:41 tron Exp $ 1$NetBSD: distinfo,v 1.6 2014/05/30 10:57:44 tron Exp $
2 2
3SHA1 (automake-1.4-p6.tar.gz) = 330c75c98e6dcdf21cbb63cf94ced8ea564b9438 3SHA1 (automake-1.4-p6.tar.gz) = 330c75c98e6dcdf21cbb63cf94ced8ea564b9438
4RMD160 (automake-1.4-p6.tar.gz) = ae40b2200eec95b601ebc65bc3cc916bb2a54066 4RMD160 (automake-1.4-p6.tar.gz) = ae40b2200eec95b601ebc65bc3cc916bb2a54066
5Size (automake-1.4-p6.tar.gz) = 375060 bytes 5Size (automake-1.4-p6.tar.gz) = 375060 bytes
6SHA1 (patch-aa) = e5e7f073a777be92f419173c9cc84dc42325a3a1 6SHA1 (patch-aa) = e5e7f073a777be92f419173c9cc84dc42325a3a1
7SHA1 (patch-ab) = b074d0139e0b36f19a71304e739ea5b7f332fcc6 7SHA1 (patch-ab) = b074d0139e0b36f19a71304e739ea5b7f332fcc6
8SHA1 (patch-ac) = 3e9800a8592c6dfd56311ab6e3066066cb5bc46f 8SHA1 (patch-ac) = bb6ce6621d5c93fd4a0bbcea7ce0f5292d451c42
cvs diff -r1.1 -r1.2 pkgsrc/devel/automake14/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/automake14/patches/patch-ac 2011/06/10 09:43:41 1.1
+++ pkgsrc/devel/automake14/patches/patch-ac 2014/05/30 10:57:44 1.2
@@ -1,21 +1,41 @@ @@ -1,21 +1,41 @@
1$NetBSD: patch-ac,v 1.1 2011/06/10 09:43:41 tron Exp $ 1$NetBSD: patch-ac,v 1.2 2014/05/30 10:57:44 tron Exp $
2 2
3Fix for CVE-2009-4029 taken from here: 31.) Fix for CVE-2009-4029 taken from here:
4 4
5http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=449d20aa12e13fefd848604225fc83d0c39c61d0 5http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=449d20aa12e13fefd848604225fc83d0c39c61d0
6 6
 72.) Make this work with Perl 5.20.0 and newer.
 8
7--- automake.in.orig 2002-07-27 21:55:58.000000000 +0100 9--- automake.in.orig 2002-07-27 21:55:58.000000000 +0100
8+++ automake.in 2011-06-10 10:34:37.000000000 +0100 10+++ automake.in 2014-05-30 11:50:32.000000000 +0100
 11@@ -983,7 +983,7 @@
 12
 13 # Compute the function name of the finisher and then call it.
 14 $name = 'lang_' . $lang . '_finish';
 15- do $name ();
 16+ eval "$name()";
 17 }
 18
 19 # If the project is entirely C++ or entirely Fortran 77, don't
 20@@ -1144,7 +1144,7 @@
 21 # Found the language, so see what it says.
 22 local ($subr) = 'lang_' . $lang . '_rewrite';
 23 # Note: computed subr call.
 24- local ($r) = do $subr ($base, $extension);
 25+ local ($r) = eval "$subr(\$base, \$extension)";
 26 # Skip this entry if we were asked not to process it.
 27 next if ! $r;
 28
9@@ -2336,7 +2336,7 @@ 29@@ -2336,7 +2336,7 @@
10 # Create dist directory. 30 # Create dist directory.
11 $output_rules .= ("\t-rm -rf \$(distdir)\n" 31 $output_rules .= ("\t-rm -rf \$(distdir)\n"
12 . "\tmkdir \$(distdir)\n" 32 . "\tmkdir \$(distdir)\n"
13- . "\t-chmod 777 \$(distdir)\n"); 33- . "\t-chmod 777 \$(distdir)\n");
14+ . "\t-chmod 755 \$(distdir)\n"); 34+ . "\t-chmod 755 \$(distdir)\n");
15 } 35 }
16  36
17 # Only run automake in `dist' target if --include-deps and 37 # Only run automake in `dist' target if --include-deps and
18@@ -2468,7 +2468,7 @@ 38@@ -2468,7 +2468,7 @@
19 . "\t" . ' test -d $(distdir)/$$subdir ' . "\\\n" 39 . "\t" . ' test -d $(distdir)/$$subdir ' . "\\\n"
20 . "\t" . ' || mkdir $(distdir)/$$subdir ' . "\\\n" 40 . "\t" . ' || mkdir $(distdir)/$$subdir ' . "\\\n"
21 . "\t" . ' || exit 1; ' . "\\\n" 41 . "\t" . ' || exit 1; ' . "\\\n"