Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f6aa6f54d00389a022397abee33092b1eb76790c
commit f6aa6f54d00389a022397abee33092b1eb76790c Author: kikadf <[email protected]> Date: Wed Jan 28 11:11:01 2015 +0100 coreutils-8.20-4-x86_64 * Fix CVE-2014-9471 diff --git a/source/base/coreutils/CVE-2014-9471.patch b/source/base/coreutils/CVE-2014-9471.patch new file mode 100644 index 0000000..556ac0f --- /dev/null +++ b/source/base/coreutils/CVE-2014-9471.patch @@ -0,0 +1,54 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## CVE-2014-9471.dpatch by Seth Arnold <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Origin: http://debbugs.gnu.org/cgi/bugreport.cgi?msg=11;filename=date-tz-crash.patch;att=1;bug=16872 +## DP: Origin: http://debbugs.gnu.org/cgi/bugreport.cgi?msg=19;filename=coreutils-date-crash.patch;att=1;bug=16872 +## DP: Combined from previous two URLs, dropping NEWS entries +## DP: Description: parse-datetime: fix crash or infloop in TZ="" parsing +## DP: Author: =?UTF-8?q?P=C3=A1draig=20Brady?= <[email protected]> + + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' coreutils-8.21~/lib/parse-datetime.y coreutils-8.21/lib/parse-datetime.y +--- coreutils-8.21~/lib/parse-datetime.y 2013-01-02 04:34:46.000000000 -0800 ++++ coreutils-8.21/lib/parse-datetime.y 2015-01-08 18:45:33.768522794 -0800 +@@ -1303,8 +1303,6 @@ + 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++) +@@ -1316,7 +1314,12 @@ + if (!setenv_ok) + goto fail; + tz_was_altered = true; ++ + p = s + 1; ++ while (c = *p, c_isspace (c)) ++ p++; ++ ++ break; + } + } + +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' coreutils-8.21~/tests/misc/date.pl coreutils-8.21/tests/misc/date.pl +--- coreutils-8.21~/tests/misc/date.pl 2013-01-30 16:46:24.000000000 -0800 ++++ coreutils-8.21/tests/misc/date.pl 2015-01-08 18:53:26.136401021 -0800 +@@ -287,6 +287,13 @@ + {ERR => "date: invalid date '\\260'\n"}, + {EXIT => 1}, + ], ++ ++ # From coreutils-5.3.0 to 8.22 inclusive ++ # this would either infinite loop or crash ++ ['invalid-TZ-crash', "-d 'TZ=\"\"\"'", ++ {ERR => "date: invalid date 'TZ=\"\"\"'\n"}, ++ {EXIT => 1}, ++ ], + ); + + # Repeat the cross-dst test, using Jan 1, 2005 and every interval from 1..364. diff --git a/source/base/coreutils/FrugalBuild b/source/base/coreutils/FrugalBuild index bace236..d9a2b9b 100644 --- a/source/base/coreutils/FrugalBuild +++ b/source/base/coreutils/FrugalBuild @@ -2,9 +2,11 @@ # Maintainer: James Buren <[email protected]> # Contributor: Miklos Vajna <[email protected]> +options+=('asneeded') + pkgname=coreutils pkgver=8.20 -pkgrel=3 +pkgrel=4 pkgdesc="These are the GNU core utilities, the basic command line programs" url="http://www.gnu.org/software/coreutils" depends=('bash>=3.2_039-3' 'glibc>=2.8-3' 'gmp>=5.0.1') @@ -15,6 +17,11 @@ source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz \ dircolors.1 dircolors.c dircolors.h DIR_COLORS newbie-aliases.sh dircolors.sh) signatures=($source.sig '' '' '' '' '' '') +# FSA fix *** +source=(${source[@]} CVE-2014-9471.patch) +signatures=(${signatures[@]} '') +# *********** + build() { Fcd _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
