[perl-File-MMagic-XS/f22] 0.09008

Tom Callaway spot at fedoraproject.org
Thu Mar 19 20:45:05 UTC 2015


commit 25ed82055eae60ca48901fe3630e077df7e388c8
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Mar 19 16:45:03 2015 -0400

    0.09008

 perl-File-MMagic-XS-format-security.patch | 22 +++++++++++-----------
 perl-File-MMagic-XS.spec                  | 10 +++++++---
 sources                                   |  2 +-
 3 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/perl-File-MMagic-XS-format-security.patch b/perl-File-MMagic-XS-format-security.patch
index d44bb70..4b42dd1 100644
--- a/perl-File-MMagic-XS-format-security.patch
+++ b/perl-File-MMagic-XS-format-security.patch
@@ -1,12 +1,12 @@
-diff -up File-MMagic-XS-0.09006/src/perl-mmagic-xs.c.format-security File-MMagic-XS-0.09006/src/perl-mmagic-xs.c
---- File-MMagic-XS-0.09006/src/perl-mmagic-xs.c.format-security	2014-06-09 15:14:03.380178779 -0400
-+++ File-MMagic-XS-0.09006/src/perl-mmagic-xs.c	2014-06-09 15:14:12.864116497 -0400
-@@ -927,7 +927,7 @@ fmm_parse_magic_line(PerlFMM *state, cha
-         err = newSVpvf(
-             "fmm_parse_magic_line: offset %s invalid", l);
-         FMM_SET_ERROR(state, err);
--        croak(SvPV_nolen(err));
-+        croak("%s", SvPV_nolen(err));
-     }
+diff -up File-MMagic-XS-0.09008/src/perl-mmagic-xs.c.format-security File-MMagic-XS-0.09008/src/perl-mmagic-xs.c
+--- File-MMagic-XS-0.09008/src/perl-mmagic-xs.c.format-security	2015-03-19 16:42:29.730420193 -0400
++++ File-MMagic-XS-0.09008/src/perl-mmagic-xs.c	2015-03-19 16:43:41.244952016 -0400
+@@ -1110,7 +1110,7 @@ GetDesc:
  
-     l = t;
+  error:
+     FMM_SET_ERROR(state, err);
+-    croak(SvPV_nolen(err));
++    croak("%s", SvPV_nolen(err));
+ }
+ 
+ /* maps to mod_mime_magic::apprentice */
diff --git a/perl-File-MMagic-XS.spec b/perl-File-MMagic-XS.spec
index c25b686..9744e94 100644
--- a/perl-File-MMagic-XS.spec
+++ b/perl-File-MMagic-XS.spec
@@ -1,6 +1,6 @@
 Name:           perl-File-MMagic-XS
-Version:        0.09006
-Release:        17%{?dist}
+Version:        0.09008
+Release:        1%{?dist}
 Summary:        Guess file type with XS
 Group:          Development/Libraries
 License:        ASL 2.0 and (GPL+ or Artistic)
@@ -30,7 +30,8 @@ an extended amount of time.
 
 %prep
 %setup -q -n File-MMagic-XS-%{version}
-%patch0 -p1
+# Merged in 0.09008
+# %patch0 -p1
 %patch1 -p1 -b .format-security
 
 %build
@@ -57,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/File::MMagic::XS.3pm*
 
 %changelog
+* Thu Mar 19 2015 Tom Callaway <spot at fedoraproject.org> - 0.09008-1
+- update to 0.09008
+
 * Wed Aug 27 2014 Jitka Plesnikova <jplesnik at redhat.com> - 0.09006-17
 - Perl 5.20 rebuild
 
diff --git a/sources b/sources
index d912b90..aa82edb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-50e9c4ee9744264923207d8f0a993912  File-MMagic-XS-0.09006.tar.gz
+b08ceccebb97c1505a6e5f70c60d0163  File-MMagic-XS-0.09008.tar.gz


More information about the scm-commits mailing list