Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1b0f8b90bbf38266c95ad40910806341f164f1ce
commit 1b0f8b90bbf38266c95ad40910806341f164f1ce Author: kikadf <[email protected]> Date: Mon Dec 15 09:45:16 2014 +0100 libyaml-0.1.5-3-x86_64 * Fix CVE-2014-9130 diff --git a/source/lib-extra/libyaml/CVE-2014-9130.patch b/source/lib-extra/libyaml/CVE-2014-9130.patch new file mode 100644 index 0000000..0faa81d --- /dev/null +++ b/source/lib-extra/libyaml/CVE-2014-9130.patch @@ -0,0 +1,28 @@ +Subject: CVE-2014-9130: assert failure when processing wrapped strings +Origin: upstream, https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2 +Bug: https://bitbucket.org/xi/libyaml/issue/10 +Bug-Debian: https://bugs.debian.org/771366 +Forwarded: not-needed +From: Kirill Simonov <[email protected]> +Last-Update: 2014-12-13 + +--- + src/scanner.c | 7 ------- + 1 file changed, 7 deletions(-) + +--- a/src/scanner.c ++++ b/src/scanner.c +@@ -1106,13 +1106,6 @@ yaml_parser_save_simple_key(yaml_parser_ + && parser->indent == (ptrdiff_t)parser->mark.column); + + /* +- * A simple key is required only when it is the first token in the current +- * line. Therefore it is always allowed. But we add a check anyway. +- */ +- +- assert(parser->simple_key_allowed || !required); /* Impossible. */ +- +- /* + * If the current position may start a simple key, save it. + */ + diff --git a/source/lib-extra/libyaml/FrugalBuild b/source/lib-extra/libyaml/FrugalBuild index 91f01c1..96a5268 100644 --- a/source/lib-extra/libyaml/FrugalBuild +++ b/source/lib-extra/libyaml/FrugalBuild @@ -1,4 +1,5 @@ # Compiling Time: 0.11 SBU +# Contributor: kikadf <[email protected]> # Maintainer: Slown <[email protected]> options+=('asneeded') @@ -6,7 +7,7 @@ options+=('asneeded') pkgname=libyaml _F_archive_name="yaml" pkgver=0.1.5 -pkgrel=2 +pkgrel=3 pkgdesc="LibYAML is a YAML 1.1 parser and emitter written in C." url="http://pyyaml.org/wiki/LibYAML"; depends=('glibc') @@ -18,8 +19,9 @@ _F_cd_path="yaml-$pkgver" sha1sums=('8b78cb9f759c7d80db8a7328c0ebecfe34fde737') # FSA fix *** -source=(${source[@]} CVE-2014-2525.patch) -sha1sums=(${sha1sums[@]} '6065e7492bf6e4e949a4c2c70abab9595e521202') +source=(${source[@]} CVE-2014-2525.patch CVE-2014-9130.patch) +sha1sums=(${sha1sums[@]} '6065e7492bf6e4e949a4c2c70abab9595e521202' \ + '424b89f24499a7ef5ef004e1b5e53479eee5ffd4') # *********** # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
