diff options
author | tron <tron> | 2011-06-10 09:43:41 +0000 |
---|---|---|
committer | tron <tron> | 2011-06-10 09:43:41 +0000 |
commit | b0e9debbb105aeff6a91d1d536815fc20bf917fa (patch) | |
tree | 9d95d77926b18e17b715e663798f3aa4cfc2b19c /devel | |
parent | be1261f26f9ef6a4ab990402c5ab1e7e82f021dc (diff) | |
download | pkgsrc-b0e9debbb105aeff6a91d1d536815fc20bf917fa.tar.gz |
Add fix for the vulnerability reported in CVE-2009-4029 taken from the
automake GIT repository.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/automake14/Makefile | 5 | ||||
-rw-r--r-- | devel/automake14/distinfo | 5 | ||||
-rw-r--r-- | devel/automake14/patches/patch-ab | 30 | ||||
-rw-r--r-- | devel/automake14/patches/patch-ac | 26 |
4 files changed, 58 insertions, 8 deletions
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile index 388adf2897d..a850cebd8b0 100644 --- a/devel/automake14/Makefile +++ b/devel/automake14/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.18 2007/09/20 22:12:08 wiz Exp $ -# +# $NetBSD: Makefile,v 1.19 2011/06/10 09:43:41 tron Exp $ DISTNAME= automake-1.4-p6 PKGNAME= automake14-1.4.6 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=automake/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnu.org/software/automake/automake.html COMMENT= GNU Standards-compliant Makefile generator (old version) +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir diff --git a/devel/automake14/distinfo b/devel/automake14/distinfo index 27b061c685d..e4a33f4d9c9 100644 --- a/devel/automake14/distinfo +++ b/devel/automake14/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 22:24:10 agc Exp $ +$NetBSD: distinfo,v 1.5 2011/06/10 09:43:41 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) = 1cd201197633853626ddc46c7ba9722c5eaf7b0e +SHA1 (patch-ab) = b074d0139e0b36f19a71304e739ea5b7f332fcc6 +SHA1 (patch-ac) = 3e9800a8592c6dfd56311ab6e3066066cb5bc46f diff --git a/devel/automake14/patches/patch-ab b/devel/automake14/patches/patch-ab index d783d70998a..58738cbbe23 100644 --- a/devel/automake14/patches/patch-ab +++ b/devel/automake14/patches/patch-ab @@ -1,8 +1,12 @@ -$NetBSD: patch-ab,v 1.3 2002/10/27 20:47:55 bouyer Exp $ +$NetBSD: patch-ab,v 1.4 2011/06/10 09:43:41 tron Exp $ ---- Makefile.in.orig Sat Jul 27 23:09:40 2002 -+++ Makefile.in -@@ -137,11 +137,11 @@ install-binSCRIPTS: $(bin_SCRIPTS) +TeXinfo path fixes and the fix for CVE-2009-4029 taken from here: + +http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=449d20aa12e13fefd848604225fc83d0c39c61d0 + +--- Makefile.in.orig 2002-07-27 22:09:40.000000000 +0100 ++++ Makefile.in 2011-06-10 10:37:07.000000000 +0100 +@@ -137,11 +137,11 @@ $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_SCRIPTS)'; for p in $$list; do \ if test -f $$p; then \ @@ -58,6 +62,24 @@ $NetBSD: patch-ab,v 1.3 2002/10/27 20:47:55 bouyer Exp $ else : ; fi uninstall-info: +@@ -456,7 +448,7 @@ + distdir: $(DISTFILES) + -rm -rf $(distdir) + mkdir $(distdir) +- -chmod 777 $(distdir) ++ -chmod 755 $(distdir) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +@@ -472,7 +464,7 @@ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ +- chmod 777 $(distdir)/$$subdir; \ ++ chmod 755 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ @@ -488,7 +480,6 @@ installcheck: installcheck-recursive install-exec-am: install-binSCRIPTS diff --git a/devel/automake14/patches/patch-ac b/devel/automake14/patches/patch-ac new file mode 100644 index 00000000000..594f1c5d36a --- /dev/null +++ b/devel/automake14/patches/patch-ac @@ -0,0 +1,26 @@ +$NetBSD: patch-ac,v 1.1 2011/06/10 09:43:41 tron Exp $ + +Fix for CVE-2009-4029 taken from here: + +http://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=449d20aa12e13fefd848604225fc83d0c39c61d0 + +--- automake.in.orig 2002-07-27 21:55:58.000000000 +0100 ++++ automake.in 2011-06-10 10:34:37.000000000 +0100 +@@ -2336,7 +2336,7 @@ + # Create dist directory. + $output_rules .= ("\t-rm -rf \$(distdir)\n" + . "\tmkdir \$(distdir)\n" +- . "\t-chmod 777 \$(distdir)\n"); ++ . "\t-chmod 755 \$(distdir)\n"); + } + + # Only run automake in `dist' target if --include-deps and +@@ -2468,7 +2468,7 @@ + . "\t" . ' test -d $(distdir)/$$subdir ' . "\\\n" + . "\t" . ' || mkdir $(distdir)/$$subdir ' . "\\\n" + . "\t" . ' || exit 1; ' . "\\\n" +- . "\t" . ' chmod 777 $(distdir)/$$subdir; ' . "\\\n" ++ . "\t" . ' chmod 755 $(distdir)/$$subdir; ' . "\\\n" + . "\t" . ' (cd $$subdir' + . ' && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(' + . (($relative_dir eq '.') ? 'distdir' : 'top_distdir') |