diff options
author | tonnerre <tonnerre@pkgsrc.org> | 2009-12-20 16:12:06 +0000 |
---|---|---|
committer | tonnerre <tonnerre@pkgsrc.org> | 2009-12-20 16:12:06 +0000 |
commit | 4c6d0f1122da35d0c95050213b0f4fc7577be3c2 (patch) | |
tree | 8e84bbf7172aa054e6f008d10709aa625fd75267 /sysutils/coreutils | |
parent | 99506141ccef0dd221133dddcabc21900a09f00d (diff) | |
download | pkgsrc-4c6d0f1122da35d0c95050213b0f4fc7577be3c2.tar.gz |
Add a fix for coreutils' CVE-2009-4135. Instead of using /tmp/coreutils
as temporary directory, use a directory in the builddir.
Diffstat (limited to 'sysutils/coreutils')
-rw-r--r-- | sysutils/coreutils/Makefile | 4 | ||||
-rw-r--r-- | sysutils/coreutils/distinfo | 3 | ||||
-rw-r--r-- | sysutils/coreutils/patches/patch-ak | 32 |
3 files changed, 36 insertions, 3 deletions
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index 1daa9d4a5be..81b3bee33fc 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.49 2009/08/12 13:36:06 asau Exp $ +# $NetBSD: Makefile,v 1.50 2009/12/20 16:12:06 tonnerre Exp $ .include "../../sysutils/coreutils/Makefile.common" -PKGREVISION= 2 +PKGREVISION= 3 CONFLICTS= fileutils-[0-9]* gnuls-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]* diff --git a/sysutils/coreutils/distinfo b/sysutils/coreutils/distinfo index c7924bd89f7..8f54ae5687d 100644 --- a/sysutils/coreutils/distinfo +++ b/sysutils/coreutils/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2009/06/12 15:09:46 joerg Exp $ +$NetBSD: distinfo,v 1.20 2009/12/20 16:12:06 tonnerre Exp $ SHA1 (coreutils-6.12.tar.gz) = 1bb297fdf8b38ca19ab5252c6179b1b2aecd020e RMD160 (coreutils-6.12.tar.gz) = 95b941657242cfc3f67d721e582a60a4090802ec @@ -11,3 +11,4 @@ SHA1 (patch-ag) = 3e24b8e025a151eb7bed4c778a326da5eed09ded SHA1 (patch-ah) = 33fe73aac79731f980fcbe1afda4c64537aff742 SHA1 (patch-ai) = 6b05293d6d151ca28ed897c47a1dad729306b770 SHA1 (patch-aj) = 436e0a871617a2450eac8bec2751419b05020b7d +SHA1 (patch-ak) = d71aca9d8d7b78e994156b888e1212bac8dac63a diff --git a/sysutils/coreutils/patches/patch-ak b/sysutils/coreutils/patches/patch-ak new file mode 100644 index 00000000000..4a33e73b71a --- /dev/null +++ b/sysutils/coreutils/patches/patch-ak @@ -0,0 +1,32 @@ +$NetBSD: patch-ak,v 1.3 2009/12/20 16:12:06 tonnerre Exp $ + +--- maint.mk.orig 2008-05-27 12:28:50.000000000 +0200 ++++ maint.mk 2009-12-20 17:02:31.000000000 +0100 +@@ -629,8 +629,9 @@ + + write_loser = printf '\#!%s\necho $$0: bad path 1>&2; exit 1\n' '$(SHELL)' + +-TMPDIR ?= /tmp +-t=$(TMPDIR)/$(PACKAGE)/test ++tmpdir = $(abs_top_builddir)/tests/torture ++ ++t=$(tmpdir)/$(PACKAGE)/test + pfx=$(t)/i + + # Verify that a twisted use of --program-transform-name=PROGRAM works. +@@ -646,6 +647,7 @@ + # Install, then verify that all binaries and man pages are in place. + # Note that neither the binary, ginstall, nor the ].1 man page is installed. + define my-instcheck ++ echo running my-instcheck; \ + $(MAKE) prefix=$(pfx) install \ + && test ! -f $(pfx)/bin/ginstall \ + && { fail=0; \ +@@ -713,6 +715,7 @@ + && $(MAKE); \ + fi + -rm -rf $(t) ++ rmdir $(tmpdir)/$(PACKAGE) $(tmpdir) + @echo "========================"; \ + echo "$(distdir).tar.gz is ready for distribution"; \ + echo "========================" |