From 294e1894216b345672f6900936d10cc453adfc4b Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Mon, 18 Aug 2014 20:30:44 +0100
Subject: [PATCH] Update to 0.51 (various minor tidy-ups, no functional
 changes)

---
 ...atch => YAML-LibYAML-0.51-format-error.patch | 17 ++++++++---------
 perl-YAML-LibYAML.spec                          | 14 +++++++++-----
 sources                                         |  2 +-
 3 files changed, 18 insertions(+), 15 deletions(-)
 rename YAML-LibYAML-0.35-format-error.patch => YAML-LibYAML-0.51-format-error.patch (67%)

diff --git a/YAML-LibYAML-0.35-format-error.patch b/YAML-LibYAML-0.51-format-error.patch
similarity index 67%
rename from YAML-LibYAML-0.35-format-error.patch
rename to YAML-LibYAML-0.51-format-error.patch
index 2b25380..415e64b 100644
--- a/YAML-LibYAML-0.35-format-error.patch
+++ b/YAML-LibYAML-0.51-format-error.patch
@@ -1,7 +1,6 @@
-diff -urbaN YAML-LibYAML-0.35-orig//LibYAML/perl_libyaml.c YAML-LibYAML-0.35/LibYAML/perl_libyaml.c
---- YAML-LibYAML-0.35-orig//LibYAML/perl_libyaml.c	2011-04-03 18:28:08.000000000 +0200
-+++ YAML-LibYAML-0.35/LibYAML/perl_libyaml.c	2011-04-08 09:25:49.633009787 +0200
-@@ -188,7 +188,7 @@
+--- LibYAML/perl_libyaml.c
++++ LibYAML/perl_libyaml.c
+@@ -188,7 +188,7 @@ Load(SV *yaml_sv)
      return;
  
  load_error:
@@ -10,7 +9,7 @@ diff -urbaN YAML-LibYAML-0.35-orig//LibYAML/perl_libyaml.c YAML-LibYAML-0.35/Lib
  }
  
  /*
-@@ -271,7 +271,7 @@
+@@ -271,7 +271,7 @@ load_node(perl_yaml_loader_t *loader)
      return return_sv;
  
      load_error:
@@ -19,7 +18,7 @@ diff -urbaN YAML-LibYAML-0.35-orig//LibYAML/perl_libyaml.c YAML-LibYAML-0.35/Lib
  }
  
  /*
-@@ -314,7 +314,7 @@
+@@ -314,7 +314,7 @@ load_mapping(perl_yaml_loader_t *loader,
          else if (strlen(tag) <= strlen(prefix) ||
              ! strnEQ(tag, prefix, strlen(prefix))
          ) croak(
@@ -27,8 +26,8 @@ diff -urbaN YAML-LibYAML-0.35-orig//LibYAML/perl_libyaml.c YAML-LibYAML-0.35/Lib
 +            "%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 @@
+         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(
@@ -36,4 +35,4 @@ diff -urbaN YAML-LibYAML-0.35-orig//LibYAML/perl_libyaml.c YAML-LibYAML-0.35/Lib
 +            "%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)); 
+         sv_bless(array_ref, gv_stashpv(class, TRUE));
diff --git a/perl-YAML-LibYAML.spec b/perl-YAML-LibYAML.spec
index efdf467..69d7f6e 100644
--- a/perl-YAML-LibYAML.spec
+++ b/perl-YAML-LibYAML.spec
@@ -1,16 +1,17 @@
 Name:           perl-YAML-LibYAML
-Version:        0.47
-Release:        2%{?dist}
+Version:        0.51
+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.35-format-error.patch
+Patch0:         YAML-LibYAML-0.51-format-error.patch
 Patch1:         YAML-LibYAML-0.41-CVE-2014-2525.patch
 Patch2:         YAML-LibYAML-0.41-CVE-2013-6393.patch
 
 # Install
+BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.30
 BuildRequires:  perl(File::Find)
 BuildRequires:  perl(File::Path)
@@ -32,7 +33,7 @@ BuildRequires:  perl(Devel::Peek)
 BuildRequires:  perl(lib)
 BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Test::Builder)
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::More) >= 0.88
 BuildRequires:  perl(Tie::Array)
 BuildRequires:  perl(Tie::Hash)
 
@@ -51,7 +52,7 @@ bound to Python and was later bound to Ruby.
 %setup -q -n YAML-LibYAML-%{version}
 
 # Fix format string vulnerabilities (CVE-2012-1152, CPAN RT#46507)
-%patch0 -p1
+%patch0
 
 # Fix LibYAML input sanitization errors (CVE-2014-2525)
 %patch1
@@ -82,6 +83,9 @@ make test
 %{_mandir}/man3/YAML::XS::LibYAML.3pm*
 
 %changelog
+* Mon Aug 18 2014 Paul Howarth <paul@city-fan.org> - 0.51-1
+- Update to 0.51 (various minor tidy-ups, no functional changes)
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.47-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 770fee6..6c7455c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58cb1359bb38b015581b997a490099ef  YAML-LibYAML-0.47.tar.gz
+ea0933f1e6da7f9eee4e707daff90782  YAML-LibYAML-0.51.tar.gz