[perl-CPAN-Checksums] Fix test skip-condition to pass in mock
Petr Pisar
ppisar at fedoraproject.org
Thu Apr 3 09:27:11 UTC 2014
commit 2f5171ebe57317144913e65115ad3082b3089106
Author: Petr Písař <ppisar at redhat.com>
Date: Thu Apr 3 09:13:12 2014 +0200
Fix test skip-condition to pass in mock
CPAN-Checksums-2.08-New-signature.patch | 61 ++++++++++++++++++++
...Try-to-connect-to-pool.sks-keyservers.net.patch | 45 ++++++++++++++
perl-CPAN-Checksums.spec | 11 +++-
3 files changed, 116 insertions(+), 1 deletions(-)
---
diff --git a/CPAN-Checksums-2.08-New-signature.patch b/CPAN-Checksums-2.08-New-signature.patch
new file mode 100644
index 0000000..d5524fb
--- /dev/null
+++ b/CPAN-Checksums-2.08-New-signature.patch
@@ -0,0 +1,61 @@
+From 6d03608c83e9ac68492ab03a208cc1499d7af96b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Thu, 3 Apr 2014 11:16:26 +0200
+Subject: [PATCH] New signature
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This resigns 2.08 with CPAN RT #94397 patch.
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ SIGNATURE | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/SIGNATURE b/SIGNATURE
+index 23272c4..627fae8 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.68.
++signed via the Module::Signature module, version 0.73.
+
+ To verify the content in this distribution, first make sure you have
+ Module::Signature installed, then type:
+@@ -12,7 +12,7 @@ the distribution may already have been compromised, and you should
+ not run its Makefile.PL or Build.PL.
+
+ -----BEGIN PGP SIGNED MESSAGE-----
+-Hash: SHA1
++Hash: SHA256
+
+ SHA1 6587f782cbd9cb71036f2e2492ca3daa389521c3 MANIFEST
+ SHA1 1c21142a9af69d1da5c027b924b8b0c052beb1da MANIFEST.SKIP
+@@ -22,7 +22,7 @@ SHA1 98d4acdec8e5b42574f8f32f453c0c0933fa569f Makefile.PL
+ SHA1 378ba4b97d5a989790877de0214ca23ac5aeef37 README
+ SHA1 b929ff9f01730419548cab2dfcc30003b49fbbfb Todo
+ SHA1 b8158703f7dbb962c56a07183b375a766951e4f1 lib/CPAN/Checksums.pm
+-SHA1 8091e870af6f081607bab636ab1e8fcfa18b12be t/00signature.t
++SHA1 89bb8f97f25483d5f618e6a63d2a4361ed0bb84c t/00signature.t
+ SHA1 51e1c061bc02e9a38948a5d8e3ca7352830f0fac t/42.gz
+ SHA1 23e182506f4b883d8aae3d29d08e044c55b04deb t/43
+ SHA1 0d942b3ef6791694fde4693d3329a0ff924cb583 t/44.bz2
+@@ -31,9 +31,9 @@ SHA1 2d74a36030efca3a42026e2ceab6837c052e8a53 t/CHECKSUMS
+ SHA1 6a79f15a10337bd3450604abf39d4462df2a550b t/pod.t
+ SHA1 3a73818d40fce12a21bf9d4d2c38ee2145cc0628 t/updatedir.t
+ -----BEGIN PGP SIGNATURE-----
+-Version: GnuPG v1.4.11 (GNU/Linux)
++Version: GnuPG v2.0.22 (GNU/Linux)
+
+-iEYEARECAAYFAk5cg3wACgkQ7IA58KMXwV0uzQCfc/vBboe7anyS25qj+zBglXSv
+-gJkAn2f3uvbHfXjdSN/XXNvss5YLH1Yc
+-=snWE
++iF4EAREIAAYFAlM9KBsACgkQEsnFx2fG+qLnuwD9Ekd3QDUjoSTbmrL4/UMZvNFa
++J6Zdq6cawLqWI6L6PZcA/3s0NjLsWiwVTvb7ddsuYnGldjSF1JFFSs3lyTBYXnZG
++=I43x
+ -----END PGP SIGNATURE-----
+--
+1.9.0
+
diff --git a/CPAN-Checksums-2.08-Try-to-connect-to-pool.sks-keyservers.net.patch b/CPAN-Checksums-2.08-Try-to-connect-to-pool.sks-keyservers.net.patch
new file mode 100644
index 0000000..b7c7711
--- /dev/null
+++ b/CPAN-Checksums-2.08-Try-to-connect-to-pool.sks-keyservers.net.patch
@@ -0,0 +1,45 @@
+From 341641c72e5c102b37bdaf349cb718f086e0e9c5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Thu, 3 Apr 2014 09:07:29 +0200
+Subject: [PATCH] Try to connect to pool.sks-keyservers.net
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+t/00signature.t fails if pool.sks-keyservers.net can be resolved, but
+you cannot connect to it. This patch augments the "Cannot connect to
+the keyserver" precheck to do real TCP connect.
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ t/00signature.t | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/t/00signature.t b/t/00signature.t
+index c7da469..75ae6d4 100644
+--- a/t/00signature.t
++++ b/t/00signature.t
+@@ -49,7 +49,19 @@ BEGIN {
+ }
+ }
+ unless ($exit_message) {
+- if (!eval { require Socket; Socket::inet_aton('pool.sks-keyservers.net') }) {
++ if (!eval {
++ use Socket qw(AF_INET SOCK_STREAM pack_sockaddr_in inet_aton);
++ my $socket;
++ socket($socket, AF_INET, SOCK_STREAM, 0) and
++ connect(
++ $socket,
++ pack_sockaddr_in(
++ scalar getservbyname('hkp', 'tcp'),
++ inet_aton('pool.sks-keyservers.net')
++ )
++ ) and
++ close($socket)
++ }) {
+ $exit_message = "Cannot connect to the keyserver";
+ }
+ }
+--
+1.9.0
+
diff --git a/perl-CPAN-Checksums.spec b/perl-CPAN-Checksums.spec
index 192c0b2..da35a14 100644
--- a/perl-CPAN-Checksums.spec
+++ b/perl-CPAN-Checksums.spec
@@ -1,11 +1,15 @@
Name: perl-CPAN-Checksums
Version: 2.08
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Write a CHECKSUMS file for a directory as on CPAN
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/CPAN-Checksums/
Source0: http://www.cpan.org/authors/id/A/AN/ANDK/CPAN-Checksums-%{version}.tar.gz
+# Fix test skip-condition to pass in mock, CPAN RT #94397, bug #1083915
+Patch0: CPAN-Checksums-2.08-Try-to-connect-to-pool.sks-keyservers.net.patch
+# Resing Patch0, produced with "cpansign sign" command before running tests
+Patch1: CPAN-Checksums-2.08-New-signature.patch
BuildArch: noarch
BuildRequires: perl(Compress::Bzip2)
BuildRequires: perl(Compress::Zlib)
@@ -32,6 +36,8 @@ Write a CHECKSUMS file for a directory as on CPAN.
%prep
%setup -q -n CPAN-Checksums-%{version}
+%patch0 -p1
+%patch1 -p1
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -55,6 +61,9 @@ make test
%{_mandir}/man3/*
%changelog
+* Thu Apr 03 2014 Petr Pisar <ppisar at redhat.com> - 2.08-9
+- Fix test skip-condition to pass in mock (bug #1083915)
+
* Wed Apr 02 2014 Petr Pisar <ppisar at redhat.com> - 2.08-8
- Remove more debuginfo remnants before running tests
More information about the scm-commits
mailing list