diff --git a/YAML-LibYAML-0.51-format-error.patch b/YAML-LibYAML-0.51-format-error.patch deleted file mode 100644 index 415e64b..0000000 --- a/YAML-LibYAML-0.51-format-error.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- LibYAML/perl_libyaml.c -+++ 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/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec index 896060c..4d6d6c7 100644 --- a/perl-YAML-LibYAML.spec +++ b/perl-YAML-LibYAML.spec @@ -1,18 +1,15 @@ Name: perl-YAML-LibYAML -Version: 0.55 +Version: 0.57 Release: 1%{?dist} Summary: Perl YAML Serialization using XS and libyaml License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/YAML-LibYAML/ -Source0: http://search.cpan.org/CPAN/authors/id/I/IN/INGY/YAML-LibYAML-%{version}.tar.gz -Patch0: YAML-LibYAML-0.51-format-error.patch +Source0: http://search.cpan.org/CPAN/authors/id/N/NA/NAWGLAN/YAML-LibYAML-%{version}.tar.gz # Install BuildRequires: perl -BuildRequires: perl(ExtUtils::MakeMaker) >= 6.30 -BuildRequires: perl(File::Find) -BuildRequires: perl(File::Path) +BuildRequires: perl(ExtUtils::MakeMaker) # Module BuildRequires: perl >= 3:5.8.3 @@ -29,6 +26,8 @@ BuildRequires: libyaml, libyaml-devel BuildRequires: perl(Carp) BuildRequires: perl(Data::Dumper) BuildRequires: perl(Devel::Peek) +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Path) BuildRequires: perl(Filter::Util::Call) BuildRequires: perl(lib) BuildRequires: perl(Scalar::Util) @@ -52,9 +51,6 @@ bound to Python and was later bound to Ruby. %prep %setup -q -n YAML-LibYAML-%{version} -# Fix format string vulnerabilities (CVE-2012-1152, CPAN RT#46507) -%patch0 - %build perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" make %{?_smp_mflags} @@ -78,6 +74,14 @@ make test %{_mandir}/man3/YAML::XS::LibYAML.3* %changelog +* Fri Jan 16 2015 Paul Howarth - 0.57-1 +- Update to 0.57 + - Update copyright year + - Use Swim cpan-tail block functions in doc + - Format string fixes (PR#21, CPAN RT#46507, CVE-2012-1152) +- This release by NAWGLAN → update source URL +- Drop patch for format string fixes, upstreamed at long last + * Wed Dec 24 2014 Paul Howarth - 0.55-1 - Update to 0.55 - Get YAML::XS using latest libyaml diff --git a/sources b/sources index 06c26f1..71a3322 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d48db921392b0ea6cf49fc0edebd0a3f YAML-LibYAML-0.55.tar.gz +6ac5aa764d55395175d7c6f60e606ce0 YAML-LibYAML-0.57.tar.gz