Thu May 24 20:21:18 2012 UTC ()
fix for CVS-2012-1152 taken from
https://rt.cpan.org/Ticket/Attachment/920541/477607/YAML-LibYAML-0.35-format-err
or.patch


(spz)
diff -r1.9 -r1.10 pkgsrc/textproc/p5-YAML-LibYAML/Makefile
diff -r1.7 -r1.8 pkgsrc/textproc/p5-YAML-LibYAML/distinfo
diff -r0 -r1.1 pkgsrc/textproc/p5-YAML-LibYAML/patches/patch-LibYAML_perl__libyaml.c
cvs diff -r1.9 -r1.10 pkgsrc/textproc/p5-YAML-LibYAML/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/p5-YAML-LibYAML/Makefile 2012/04/10 13:50:04 1.9
+++ pkgsrc/textproc/p5-YAML-LibYAML/Makefile 2012/05/24 20:21:18 1.10
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.9 2012/04/10 13:50:04 sno Exp $ 1# $NetBSD: Makefile,v 1.10 2012/05/24 20:21:18 spz Exp $
2# 2#
3 3
4DISTNAME= YAML-LibYAML-0.38 4DISTNAME= YAML-LibYAML-0.38
 5PKGREVISION= 1
5PKGNAME= p5-${DISTNAME} 6PKGNAME= p5-${DISTNAME}
6#PKGNAME= p5-${DISTNAME:S/LibYAML/XS/} 7#PKGNAME= p5-${DISTNAME:S/LibYAML/XS/}
7CATEGORIES= textproc perl5 8CATEGORIES= textproc perl5
8MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=YAML/} 9MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=YAML/}
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://search.cpan.org/dist/YAML-LibYAML/ 12HOMEPAGE= http://search.cpan.org/dist/YAML-LibYAML/
12COMMENT= Perl XS binding to libyaml 13COMMENT= Perl XS binding to libyaml
13LICENSE= ${PERL5_LICENSE} 14LICENSE= ${PERL5_LICENSE}
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17PERL5_PACKLIST= auto/YAML/LibYAML/.packlist 18PERL5_PACKLIST= auto/YAML/LibYAML/.packlist
cvs diff -r1.7 -r1.8 pkgsrc/textproc/p5-YAML-LibYAML/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/p5-YAML-LibYAML/distinfo 2012/04/10 13:50:05 1.7
+++ pkgsrc/textproc/p5-YAML-LibYAML/distinfo 2012/05/24 20:21:18 1.8
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.7 2012/04/10 13:50:05 sno Exp $ 1$NetBSD: distinfo,v 1.8 2012/05/24 20:21:18 spz Exp $
2 2
3SHA1 (YAML-LibYAML-0.38.tar.gz) = d522fac459f07f31d1f239ca7d19ccc2e29cb524 3SHA1 (YAML-LibYAML-0.38.tar.gz) = d522fac459f07f31d1f239ca7d19ccc2e29cb524
4RMD160 (YAML-LibYAML-0.38.tar.gz) = 3b3ffdc9c7a03f4301a805d61593f3468b505b9f 4RMD160 (YAML-LibYAML-0.38.tar.gz) = 3b3ffdc9c7a03f4301a805d61593f3468b505b9f
5Size (YAML-LibYAML-0.38.tar.gz) = 176599 bytes 5Size (YAML-LibYAML-0.38.tar.gz) = 176599 bytes
 6SHA1 (patch-LibYAML_perl__libyaml.c) = 6f6ebfb0efd2ac4dbc3950ff808112b7e8d292d0
File Added: pkgsrc/textproc/p5-YAML-LibYAML/patches/Attic/patch-LibYAML_perl__libyaml.c
$NetBSD: patch-LibYAML_perl__libyaml.c,v 1.1 2012/05/24 20:21:18 spz 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	2011-04-03 16:28:08.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));