Update to 0.54:

0.54 Sat Nov 29 11:47:10 PST 2014
 - Reverted an old patch with 0.53. Unreverted.

0.53 Fri Nov 28 09:20:08 PST 2014
 - Fix for
   https://bitbucket.org/xi/libyaml/issue/10/wrapped-strings-cause-assert-f
   ailure

5 files changed, 6 insertions, 102 deletions

diff --git a/textproc/p5-YAML-LibYAML/Makefile b/textproc/p5-YAML-LibYAML/Makefile
index 1f8cf8cb5e8..ec272fc64f5 100644
--- a/textproc/p5-YAML-LibYAML/Makefile
+++ b/textproc/p5-YAML-LibYAML/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2014/11/12 11:49:41 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2014/11/30 13:18:43 wiz Exp $
 
-DISTNAME=	YAML-LibYAML-0.52
+DISTNAME=	YAML-LibYAML-0.54
 PKGNAME=	p5-${DISTNAME}
 #PKGNAME=	p5-${DISTNAME:S/LibYAML/XS/}
 CATEGORIES=	textproc perl5
diff --git a/textproc/p5-YAML-LibYAML/distinfo b/textproc/p5-YAML-LibYAML/distinfo
index abcb24c0deb..775bf537331 100644
--- a/textproc/p5-YAML-LibYAML/distinfo
+++ b/textproc/p5-YAML-LibYAML/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.12 2014/11/12 11:49:41 wiz Exp $
+$NetBSD: distinfo,v 1.13 2014/11/30 13:18:43 wiz Exp $
 
-SHA1 (YAML-LibYAML-0.52.tar.gz) = c164a46fe7f62b805608efc9f0538fa6530d0fcf
-RMD160 (YAML-LibYAML-0.52.tar.gz) = 24b6277962d5ae7552b82a0ed4f56559a7513a92
-Size (YAML-LibYAML-0.52.tar.gz) = 140142 bytes
-SHA1 (patch-LibYAML_perl__libyaml.c) = 9d3672b590e795385dc7293ecb947ebc0580a047
-SHA1 (patch-LibYAML_scanner.c) = a137573730112f5b5a3f2bef03e0adb7d3c8d054
-SHA1 (patch-LibYAML_yaml__private.h) = 4e6cc0c37dc53dc49833d7d70663fcc73f0d7c8b
+SHA1 (YAML-LibYAML-0.54.tar.gz) = 4772ef1ee5bd6f23306b1426c50e6892609decc8
+RMD160 (YAML-LibYAML-0.54.tar.gz) = 17644206546e1117a478fea7ff449a7ce11c1ac5
+Size (YAML-LibYAML-0.54.tar.gz) = 140645 bytes
diff --git a/textproc/p5-YAML-LibYAML/patches/patch-LibYAML_perl__libyaml.c b/textproc/p5-YAML-LibYAML/patches/patch-LibYAML_perl__libyaml.c
deleted file mode 100644
index bc6e079ddf8..00000000000
--- a/textproc/p5-YAML-LibYAML/patches/patch-LibYAML_perl__libyaml.c
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-LibYAML_perl__libyaml.c,v 1.2 2014/11/12 11:49:41 wiz Exp $
-
-fix for CVS-2012-1152 taken from
-https://rt.cpan.org/Ticket/Attachment/920541/477607/YAML-LibYAML-0.35-format-error.patch
-
---- LibYAML/perl_libyaml.c.orig	2014-08-23 04:03:32.000000000 +0000
-+++ LibYAML/perl_libyaml.c
-@@ -188,7 +188,7 @@ Load(SV *yaml_sv)
-     return;
- 
- load_error:
--    croak(loader_error_msg(&loader, NULL));
-+    croak("%s", loader_error_msg(&loader, NULL));
- }
- 
- /*
-@@ -271,7 +271,7 @@ load_node(perl_yaml_loader_t *loader)
-     return return_sv;
- 
-     load_error:
--        croak(loader_error_msg(loader, NULL));
-+        croak("%s", loader_error_msg(loader, NULL));
- }
- 
- /*
-@@ -314,7 +314,7 @@ load_mapping(perl_yaml_loader_t *loader,
-         else if (strlen(tag) <= strlen(prefix) ||
-             ! strnEQ(tag, prefix, strlen(prefix))
-         ) croak(
--            loader_error_msg(loader, form("bad tag found for hash: '%s'", tag))
-+            "%s", loader_error_msg(loader, form("bad tag found for hash: '%s'", tag))
-         );
-         class = tag + strlen(prefix);
-         sv_bless(hash_ref, gv_stashpv(class, TRUE));
-@@ -347,7 +347,7 @@ load_sequence(perl_yaml_loader_t *loader
-         else if (strlen(tag) <= strlen(prefix) ||
-             ! strnEQ(tag, prefix, strlen(prefix))
-         ) croak(
--            loader_error_msg(loader, form("bad tag found for array: '%s'", tag))
-+            "%s", loader_error_msg(loader, form("bad tag found for array: '%s'", tag))
-         );
-         class = tag + strlen(prefix);
-         sv_bless(array_ref, gv_stashpv(class, TRUE));
diff --git a/textproc/p5-YAML-LibYAML/patches/patch-LibYAML_scanner.c b/textproc/p5-YAML-LibYAML/patches/patch-LibYAML_scanner.c
deleted file mode 100644
index 2173d864eaa..00000000000
--- a/textproc/p5-YAML-LibYAML/patches/patch-LibYAML_scanner.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-LibYAML_scanner.c,v 1.1 2014/04/14 13:22:20 obache Exp $
-
-* CVE-2013-6393
-  https://bitbucket.org/xi/libyaml/commits/1d73f004f49e6962cf936da98aecf0aec95c4c50
-* CVE-2014-2525
-  https://bitbucket.org/xi/libyaml/commits/bce8b60f0b9af69fa9fab3093d0a41ba243de048
-
---- LibYAML/scanner.c.orig	2013-03-12 17:58:04.000000000 +0000
-+++ LibYAML/scanner.c
-@@ -2574,7 +2574,7 @@ yaml_parser_scan_tag_uri(yaml_parser_t *
- 
-     /* Resize the string to include the head. */
- 
--    while (string.end - string.start <= (int)length) {
-+    while ((size_t)(string.end - string.start) <= length) {
-         if (!yaml_string_extend(&string.start, &string.pointer, &string.end)) {
-             parser->error = YAML_MEMORY_ERROR;
-             goto error;
-@@ -2619,6 +2619,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/p5-YAML-LibYAML/patches/patch-LibYAML_yaml__private.h b/textproc/p5-YAML-LibYAML/patches/patch-LibYAML_yaml__private.h
deleted file mode 100644
index 1f675454394..00000000000
--- a/textproc/p5-YAML-LibYAML/patches/patch-LibYAML_yaml__private.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-LibYAML_yaml__private.h,v 1.1 2014/04/14 13:22:20 obache Exp $
-
-* CVE-2014-2525
-  https://bitbucket.org/xi/libyaml/commits/bce8b60f0b9af69fa9fab3093d0a41ba243de048
-
---- LibYAML/yaml_private.h.orig	2013-03-12 17:58:04.000000000 +0000
-+++ LibYAML/yaml_private.h
-@@ -132,9 +132,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,                                         \