diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/coreutils/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/coreutils/Makefile.common | 11 | ||||
| -rw-r--r-- | sysutils/coreutils/distinfo | 9 | ||||
| -rw-r--r-- | sysutils/coreutils/patches/patch-lib_parse-datetime.c | 32 |
4 files changed, 14 insertions, 41 deletions
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index fac6e00ae22..f4d3d46fb9c 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.64 2015/04/13 12:05:08 tnn Exp $ +# $NetBSD: Makefile,v 1.65 2015/05/07 00:24:59 mef Exp $ .include "../../sysutils/coreutils/Makefile.common" -PKGREVISION= 2 CONFIGURE_ARGS+= --without-gmp CONFLICTS= fileutils-[0-9]* gnuls-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]* diff --git a/sysutils/coreutils/Makefile.common b/sysutils/coreutils/Makefile.common index ef406aaebbe..50c868fd87a 100644 --- a/sysutils/coreutils/Makefile.common +++ b/sysutils/coreutils/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.10 2015/04/17 12:46:00 manu Exp $ +# $NetBSD: Makefile.common,v 1.11 2015/05/07 00:24:59 mef Exp $ # used by sysutils/coreutils/Makefile # used by misc/gnuls/Makefile -DISTNAME= coreutils-8.22 +DISTNAME= coreutils-8.23 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/} EXTRACT_SUFX= .tar.xz @@ -21,6 +21,13 @@ GNU_CONFIGURE= YES USE_TOOLS+= msgfmt msgmerge perl xgettext USE_PKGLOCALEDIR= YES +# --- man/chroot.1 --- +# GEN man/chroot.1 +# help2man: can't get `--help' info from chroot.td/chroot +# Try `--no-discard-stderr' if option outputs to stderr +# *** [man/chroot.1] Error code 127 +MAKE_JOBS_SAFE= NO + TEST_TARGET= check .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/coreutils/distinfo b/sysutils/coreutils/distinfo index e2d4816d11d..2f40b40a9cb 100644 --- a/sysutils/coreutils/distinfo +++ b/sysutils/coreutils/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.30 2015/04/13 12:05:08 tnn Exp $ +$NetBSD: distinfo,v 1.31 2015/05/07 00:24:59 mef Exp $ -SHA1 (coreutils-8.22.tar.xz) = cc7fe47b21eb49dd2ee4cdb707570f42fb2c8cc6 -RMD160 (coreutils-8.22.tar.xz) = c3da7ade1d3ac82e97ac4a24c70376af8b9b503b -Size (coreutils-8.22.tar.xz) = 5335124 bytes +SHA1 (coreutils-8.23.tar.xz) = adead02839225218b85133fa57b4dba02af2291d +RMD160 (coreutils-8.23.tar.xz) = d4c433968cd77dbf86e9f4a75c622b24aa7c2726 +Size (coreutils-8.23.tar.xz) = 5375612 bytes SHA1 (patch-Makefile.in) = fce694c56777081a6a54d157dd0573945250f381 SHA1 (patch-lib-fflush.c) = 106e9c7d05fff290f24cb69e1b2c80d0077c62bd SHA1 (patch-lib-fseeko.c) = 9f4b0294698648011c64869fc0e642f910e9d47f -SHA1 (patch-lib_parse-datetime.c) = 9a2143f0d6e908c2b340a2520f2a280c5fb80e6d SHA1 (patch-lib_string.in.h) = 37167af962d1cfe9196d11e4250d9e9628d9eb73 diff --git a/sysutils/coreutils/patches/patch-lib_parse-datetime.c b/sysutils/coreutils/patches/patch-lib_parse-datetime.c deleted file mode 100644 index dd9d93f616c..00000000000 --- a/sysutils/coreutils/patches/patch-lib_parse-datetime.c +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-lib_parse-datetime.c,v 1.1 2015/04/13 12:05:08 tnn Exp $ - -Fix CVE-2014-9471 TZ parsing bug. -Via https://debbugs.gnu.org/cgi/bugreport.cgi?bug=16872 - -Note that we patch the generated parser instead of the -bison grammar to avoid adding bison dependency here. - ---- lib/parse-datetime.c.orig 2013-12-09 14:43:39.000000000 +0000 -+++ lib/parse-datetime.c -@@ -3207,8 +3207,6 @@ parse_datetime (struct timespec *result, - char tz1buf[TZBUFSIZE]; - bool large_tz = TZBUFSIZE < tzsize; - bool setenv_ok; -- /* Free tz0, in case this is the 2nd or subsequent time through. */ -- free (tz0); - tz0 = get_tz (tz0buf); - z = tz1 = large_tz ? xmalloc (tzsize) : tz1buf; - for (s = tzbase; *s != '"'; s++) -@@ -3220,7 +3218,12 @@ parse_datetime (struct timespec *result, - if (!setenv_ok) - goto fail; - tz_was_altered = true; -+ - p = s + 1; -+ while (c = *p, c_isspace (c)) -+ p++; -+ -+ break; - } - } - |