[pkgsrc/trunk]: pkgsrc/textproc/libyaml Update to 0.1.6, which includes the C...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b02badf9eb4
branches:  trunk
changeset: 632602:0b02badf9eb4
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Apr 01 21:10:34 2014 +0000

description:
Update to 0.1.6, which includes the CVE fixes.

diffstat:

 textproc/libyaml/Makefile                      |   6 ++----
 textproc/libyaml/distinfo                      |  10 ++++------
 textproc/libyaml/patches/patch-CVE-2014-2525_1 |  16 ----------------
 textproc/libyaml/patches/patch-CVE-2014-2525_2 |  19 -------------------
 4 files changed, 6 insertions(+), 45 deletions(-)

diffs (73 lines):

diff -r 4e051928119e -r 0b02badf9eb4 textproc/libyaml/Makefile
--- a/textproc/libyaml/Makefile Tue Apr 01 20:04:27 2014 +0000
+++ b/textproc/libyaml/Makefile Tue Apr 01 21:10:34 2014 +0000
@@ -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 -r 4e051928119e -r 0b02badf9eb4 textproc/libyaml/distinfo
--- a/textproc/libyaml/distinfo Tue Apr 01 20:04:27 2014 +0000
+++ b/textproc/libyaml/distinfo Tue Apr 01 21:10:34 2014 +0000
@@ -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 -r 4e051928119e -r 0b02badf9eb4 textproc/libyaml/patches/patch-CVE-2014-2525_1
--- a/textproc/libyaml/patches/patch-CVE-2014-2525_1    Tue Apr 01 20:04:27 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 4e051928119e -r 0b02badf9eb4 textproc/libyaml/patches/patch-CVE-2014-2525_2
--- a/textproc/libyaml/patches/patch-CVE-2014-2525_2    Tue Apr 01 20:04:27 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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,                                         \