diff options
| author | wiz <wiz@pkgsrc.org> | 2014-04-01 21:10:34 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-04-01 21:10:34 +0000 |
| commit | 281abbf8e6843f0cbfe9602d64187b577b1eaced (patch) | |
| tree | ff97b12997da8fb703bf56db6c690700cddac15c | |
| parent | b76032d4daaee0432303e80d68331459b22bb23e (diff) | |
| download | pkgsrc-281abbf8e6843f0cbfe9602d64187b577b1eaced.tar.gz | |
Update to 0.1.6, which includes the CVE fixes.
| -rw-r--r-- | textproc/libyaml/Makefile | 6 | ||||
| -rw-r--r-- | textproc/libyaml/distinfo | 10 | ||||
| -rw-r--r-- | textproc/libyaml/patches/patch-CVE-2014-2525_1 | 16 | ||||
| -rw-r--r-- | textproc/libyaml/patches/patch-CVE-2014-2525_2 | 19 |
4 files changed, 6 insertions, 45 deletions
diff --git a/textproc/libyaml/Makefile b/textproc/libyaml/Makefile index a34b2afbe4f..79104b57374 100644 --- a/textproc/libyaml/Makefile +++ b/textproc/libyaml/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2014/03/28 16:02:01 drochner Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/04/01 21:10:34 wiz Exp $ -DISTNAME= yaml-0.1.5 +DISTNAME= yaml-0.1.6 PKGNAME= lib${DISTNAME} -PKGREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://pyyaml.org/download/libyaml/ diff --git a/textproc/libyaml/distinfo b/textproc/libyaml/distinfo index 872e31b1325..65a9afc14bd 100644 --- a/textproc/libyaml/distinfo +++ b/textproc/libyaml/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.5 2014/03/28 16:02:01 drochner Exp $ +$NetBSD: distinfo,v 1.6 2014/04/01 21:10:34 wiz Exp $ -SHA1 (yaml-0.1.5.tar.gz) = 8b78cb9f759c7d80db8a7328c0ebecfe34fde737 -RMD160 (yaml-0.1.5.tar.gz) = 58d5a60ccc13c728bed48013cd0a5f001d7bde04 -Size (yaml-0.1.5.tar.gz) = 504897 bytes -SHA1 (patch-CVE-2014-2525_1) = b7695050a303b14c118fa4ff889cdb92ce338ac9 -SHA1 (patch-CVE-2014-2525_2) = 6239cc15e6f5503839c81fde2c31df00a880f061 +SHA1 (yaml-0.1.6.tar.gz) = f3d404e11bec3c4efcddfd14c42d46f1aabe0b5d +RMD160 (yaml-0.1.6.tar.gz) = c37f04eb6d8c3c587bf241c2f3daf74b6d24f513 +Size (yaml-0.1.6.tar.gz) = 503012 bytes diff --git a/textproc/libyaml/patches/patch-CVE-2014-2525_1 b/textproc/libyaml/patches/patch-CVE-2014-2525_1 deleted file mode 100644 index da02bccb941..00000000000 --- a/textproc/libyaml/patches/patch-CVE-2014-2525_1 +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-CVE-2014-2525_1,v 1.1 2014/03/28 16:02:01 drochner Exp $ - -https://bitbucket.org/xi/libyaml/commits/bce8b60f0b9af69fa9fab3093d0a41ba243de048 - ---- src/scanner.c.orig 2014-03-28 15:47:54.000000000 +0000 -+++ src/scanner.c -@@ -2629,6 +2629,9 @@ yaml_parser_scan_tag_uri(yaml_parser_t * - /* Check if it is a URI-escape sequence. */ - - if (CHECK(parser->buffer, '%')) { -+ if (!STRING_EXTEND(parser, string)) -+ goto error; -+ - if (!yaml_parser_scan_uri_escapes(parser, - directive, start_mark, &string)) goto error; - } diff --git a/textproc/libyaml/patches/patch-CVE-2014-2525_2 b/textproc/libyaml/patches/patch-CVE-2014-2525_2 deleted file mode 100644 index 4642914e3dd..00000000000 --- a/textproc/libyaml/patches/patch-CVE-2014-2525_2 +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-CVE-2014-2525_2,v 1.1 2014/03/28 16:02:01 drochner Exp $ - ---- src/yaml_private.h.orig 2014-03-28 15:50:03.000000000 +0000 -+++ src/yaml_private.h -@@ -143,9 +143,12 @@ yaml_string_join( - (string).start = (string).pointer = (string).end = 0) - - #define STRING_EXTEND(context,string) \ -- (((string).pointer+5 < (string).end) \ -+ ((((string).pointer+5 < (string).end) \ - || yaml_string_extend(&(string).start, \ -- &(string).pointer, &(string).end)) -+ &(string).pointer, &(string).end)) ? \ -+ 1 : \ -+ ((context)->error = YAML_MEMORY_ERROR, \ -+ 0)) - - #define CLEAR(context,string) \ - ((string).pointer = (string).start, \ |