ppisar pushed to perl-Crypt-CipherSaber (master). "Adjust to changes in Module-Signature-0.74"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Apr 13 13:24:01 UTC 2015


>From e8194ee4747bedd020b0521044bec83845e7584d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Mon, 13 Apr 2015 15:13:01 +0200
Subject: Adjust to changes in Module-Signature-0.74


diff --git a/Crypt-CipherSaber-1.00-Do-not-verify-files-missing-from-MANIFEST.patch b/Crypt-CipherSaber-1.00-Do-not-verify-files-missing-from-MANIFEST.patch
new file mode 100644
index 0000000..d21a31a
--- /dev/null
+++ b/Crypt-CipherSaber-1.00-Do-not-verify-files-missing-from-MANIFEST.patch
@@ -0,0 +1,36 @@
+From aa3a3f5b7f4d15ee3cb30de679f4651f40c09eef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Mon, 13 Apr 2015 15:04:59 +0200
+Subject: [PATCH] Do not verify files missing from MANIFEST
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Module-Signature-0.74 ignores MANIFEST.SKIP by default as a result of
+a security fix. This patch enables the (built-in) skip list again as
+the 0-signature.t is a sanity author test rather than a security check
+which should be performed before executing ./Build.PL or Makefile.PL.
+
+CPAN RT#103485
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ t/0-signature.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/0-signature.t b/t/0-signature.t
+index 48bb368..3bf3ec5 100644
+--- a/t/0-signature.t
++++ b/t/0-signature.t
+@@ -5,7 +5,7 @@ use Test::More tests => 1;
+ 
+ SKIP: {
+     if (eval { require Module::Signature; 1 }) {
+-	ok(Module::Signature::verify() == Module::Signature::SIGNATURE_OK()
++	ok(Module::Signature::verify(skip => 1) == Module::Signature::SIGNATURE_OK()
+ 	    => "Valid signature" );
+     }
+     else {
+-- 
+2.1.0
+
diff --git a/Crypt-CipherSaber-1.00-Resign-the-distribution.patch b/Crypt-CipherSaber-1.00-Resign-the-distribution.patch
index d674380..f6e23dc 100644
--- a/Crypt-CipherSaber-1.00-Resign-the-distribution.patch
+++ b/Crypt-CipherSaber-1.00-Resign-the-distribution.patch
@@ -1,6 +1,6 @@
-From 207dea8cf13880dc9b112652db9d0386ee21953e Mon Sep 17 00:00:00 2001
+From a947adc689b85768b9b65453a6efe8cb5e2040c1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
-Date: Wed, 27 Aug 2014 15:56:12 +0200
+Date: Mon, 13 Apr 2015 15:08:47 +0200
 Subject: [PATCH] Resign the distribution
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -8,17 +8,17 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Petr Písař <ppisar at redhat.com>
 ---
- SIGNATURE | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
+ SIGNATURE | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/SIGNATURE b/SIGNATURE
-index 1a25cd4..8eaaebe 100644
+index 1a25cd4..f83f805 100644
 --- a/SIGNATURE
 +++ b/SIGNATURE
 @@ -1,5 +1,5 @@
  This file contains message digests of all files listed in MANIFEST,
 -signed via the Module::Signature module, version 0.44.
-+signed via the Module::Signature module, version 0.73.
++signed via the Module::Signature module, version 0.78.
  
  To verify the content in this distribution, first make sure you have
  Module::Signature installed, then type:
@@ -31,16 +31,17 @@ index 1a25cd4..8eaaebe 100644
  
  SHA1 80bc94fb6bfcb7c680fb458b55e3b1301e19dc8d Build.PL
  SHA1 8153f68a5a4725476b3e5b1460b1bf6d8c0e9b17 Changes
-@@ -20,7 +20,7 @@ SHA1 a21beaa3ee715f216db0dd42b2a3984f02896c91 MANIFEST
+@@ -20,23 +20,23 @@ SHA1 a21beaa3ee715f216db0dd42b2a3984f02896c91 MANIFEST
  SHA1 c693376329238a7d4e66df3e5cadfbf8984271a5 META.yml
  SHA1 89badd63f031ee283647f7a60ac24c2bdad4724f Makefile.PL
  SHA1 01ab13d602962b3cece3ee21f4a94fa9f791089e README
 -SHA1 195b43a0cf4205d20c39ec9ae3ccf131337fc3dd lib/Crypt/CipherSaber.pm
+-SHA1 f35a25f9883738be60f36b3ec2d0aeae9e2a9608 t/0-signature.t
 +SHA1 9d90c8f3765a0867ae50b4da11d5917528684798 lib/Crypt/CipherSaber.pm
- SHA1 f35a25f9883738be60f36b3ec2d0aeae9e2a9608 t/0-signature.t
++SHA1 4944e1e962603b97c1eec1cb311313a061c9237d t/0-signature.t
  SHA1 2a24fe5acc19ef82f476a2634856af8c4f02b479 t/CS2.t
  SHA1 77a9031ccfd49486409f119daa5048c34542a29c t/base.t
-@@ -28,15 +28,15 @@ SHA1 2bd8b8faa4768bb323a3de9d9d333854b7240d18 t/bigfile.t
+ SHA1 2bd8b8faa4768bb323a3de9d9d333854b7240d18 t/bigfile.t
  SHA1 c03dcb0143cb728fc51a5bade84fe0b60ed95fbe t/both_long.t
  SHA1 3c9c40b67a46f4cbaf129468dbd55690d9d935cd t/create.t
  SHA1 af740c6407da521170bf9ce67da5017d9952e41e t/encrypt.t
@@ -57,10 +58,10 @@ index 1a25cd4..8eaaebe 100644
 -iD8DBQFC1HEbBd8Wn1wI6cQRAr/qAJ9GyiesUvi1bxn+uodxCHZBfnRTrQCdFNkI
 -4dIIEEIP4prHtDe/WPZRux4=
 -=swxm
-+iF4EAREIAAYFAlP9404ACgkQEsnFx2fG+qIPjgEAkDyY517F4UkwzeMkkv6ZBtyR
-+x3jng78uau0NkDqnH9kA+QGw05y/Kf/fjOtIJIIEezNPjo6NmFgBnp/pb3n3xUsf
-+=kDef
++iF4EAREIAAYFAlUrv8oACgkQEsnFx2fG+qJW/QEAkjyjL3b6LaVg0/PMsa1gWrj7
++n6e2svetBBARHno5l00BAJN5h87GIFhvBRbRgqPX7/vNMKOslKzKDlFtoYqBx6cU
++=5adX
  -----END PGP SIGNATURE-----
 -- 
-1.9.3
+2.1.0
 
diff --git a/perl-Crypt-CipherSaber.spec b/perl-Crypt-CipherSaber.spec
index dc57474..babbe0b 100644
--- a/perl-Crypt-CipherSaber.spec
+++ b/perl-Crypt-CipherSaber.spec
@@ -1,6 +1,6 @@
 Name:           perl-Crypt-CipherSaber
 Version:        1.00
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Perl module implementing CipherSaber encryption
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -9,8 +9,10 @@ Source0:        http://www.cpan.org/modules/by-module/Crypt/Crypt-CipherSaber-%{
 Source1:        67C6FAA2.key
 # Fix parsing encrypted file, bug #1104075, CPAN RT#28370
 Patch0:         Crypt-CipherSaber-1.00-Fix-reading-IV-with-new-lines-from-a-file.patch
-# Resign the patched distribution, #1104075
-Patch1:         Crypt-CipherSaber-1.00-Resign-the-distribution.patch
+# Adjust to changes in Module-Signature-0.74, bug #1211212, CPAN RT#103485
+Patch1:         Crypt-CipherSaber-1.00-Do-not-verify-files-missing-from-MANIFEST.patch
+# Resign the patched distribution, #1104075, #1211212
+Patch2:         Crypt-CipherSaber-1.00-Resign-the-distribution.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
@@ -31,6 +33,7 @@ relatively secure algorithm based on RC4.
 %setup -q -n Crypt-CipherSaber-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__perl} Build.PL installdirs=vendor
@@ -63,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 13 2015 Petr Pisar <ppisar at redhat.com> - 1.00-19
+- Adjust to changes in Module-Signature-0.74 (bug #1211212)
+
 * Thu Aug 28 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1.00-18
 - Perl 5.20 rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-Crypt-CipherSaber.git/commit/?h=master&id=e8194ee4747bedd020b0521044bec83845e7584d


More information about the scm-commits mailing list