summaryrefslogtreecommitdiff
path: root/devel/automake14/patches
diff options
context:
space:
mode:
Diffstat (limited to 'devel/automake14/patches')
-rw-r--r--devel/automake14/patches/patch-ab30
-rw-r--r--devel/automake14/patches/patch-ac26
2 files changed, 52 insertions, 4 deletions
diff --git a/devel/automake14/patches/patch-ab b/devel/automake14/patches/patch-ab
index d783d70998a..c979f4c54b5 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.3.66.1 2011/06/11 05:12:04 sbd 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..ad8c4239eb0
--- /dev/null
+++ b/devel/automake14/patches/patch-ac
@@ -0,0 +1,26 @@
+$NetBSD: patch-ac,v 1.1.2.2 2011/06/11 05:12:04 sbd 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')