diff options
| author | spz <spz@pkgsrc.org> | 2012-05-24 20:21:18 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2012-05-24 20:21:18 +0000 |
| commit | df7bbeadcab39c96bc93a46e06e88ed600c9b49b (patch) | |
| tree | 4e8681e3e2802b946b67694c42c37e26052c1ed9 /textproc | |
| parent | cac711ecf4ea905825e2e5d0042e5927a99015ff (diff) | |
| download | pkgsrc-df7bbeadcab39c96bc93a46e06e88ed600c9b49b.tar.gz | |
fix for CVS-2012-1152 taken from
https://rt.cpan.org/Ticket/Attachment/920541/477607/YAML-LibYAML-0.35-format-err
or.patch
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/p5-YAML-LibYAML/Makefile | 3 | ||||
| -rw-r--r-- | textproc/p5-YAML-LibYAML/distinfo | 3 | ||||
| -rw-r--r-- | textproc/p5-YAML-LibYAML/patches/patch-LibYAML_perl__libyaml.c | 43 |
3 files changed, 47 insertions, 2 deletions
diff --git a/textproc/p5-YAML-LibYAML/Makefile b/textproc/p5-YAML-LibYAML/Makefile index af6ebf66a56..7472da2d3a4 100644 --- a/textproc/p5-YAML-LibYAML/Makefile +++ b/textproc/p5-YAML-LibYAML/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2012/04/10 13:50:04 sno Exp $ +# $NetBSD: Makefile,v 1.10 2012/05/24 20:21:18 spz Exp $ # DISTNAME= YAML-LibYAML-0.38 +PKGREVISION= 1 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 628709c617f..2aab7faa9b2 100644 --- a/textproc/p5-YAML-LibYAML/distinfo +++ b/textproc/p5-YAML-LibYAML/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.7 2012/04/10 13:50:05 sno Exp $ +$NetBSD: distinfo,v 1.8 2012/05/24 20:21:18 spz Exp $ SHA1 (YAML-LibYAML-0.38.tar.gz) = d522fac459f07f31d1f239ca7d19ccc2e29cb524 RMD160 (YAML-LibYAML-0.38.tar.gz) = 3b3ffdc9c7a03f4301a805d61593f3468b505b9f Size (YAML-LibYAML-0.38.tar.gz) = 176599 bytes +SHA1 (patch-LibYAML_perl__libyaml.c) = 6f6ebfb0efd2ac4dbc3950ff808112b7e8d292d0 diff --git a/textproc/p5-YAML-LibYAML/patches/patch-LibYAML_perl__libyaml.c b/textproc/p5-YAML-LibYAML/patches/patch-LibYAML_perl__libyaml.c new file mode 100644 index 00000000000..2ce82e5b1b0 --- /dev/null +++ b/textproc/p5-YAML-LibYAML/patches/patch-LibYAML_perl__libyaml.c @@ -0,0 +1,43 @@ +$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)); |