commit a23d1a649da4159d56fb16e648eb54971883ba32
Author: Paul Howarth <p...@city-fan.org>
Date: Mon Jul 2 10:02:15 2012 +0100
Fix breakage with Perl 5.16 (CPAN RT#76482)
- Fix breakage with Perl 5.16 (CPAN RT#76482)
- Drop buildreqs for modules that are not dual-lived
- Don't need to remove empty directories from the buildroot
Net-SSH-Perl-1.34--perl5.16.patch | 11 ++++++++++
Net-SSH-Perl-1.34-SIGNATURE.patch | 39 +++++++++++++++++++++++++++++++++++++
Net-SSH-Perl-1.34-stopwords.patch | 32 ------------------------------
perl-Net-SSH-Perl.spec | 24 +++++++++++++++++-----
4 files changed, 68 insertions(+), 38 deletions(-)
---
diff --git a/Net-SSH-Perl-1.34--perl5.16.patch
b/Net-SSH-Perl-1.34--perl5.16.patch
new file mode 100644
index 0000000..2f6725b
--- /dev/null
+++ b/Net-SSH-Perl-1.34--perl5.16.patch
@@ -0,0 +1,11 @@
+--- t/03-packet.t-orig 2012-05-22 14:37:48.000000000 +0100
++++ t/03-packet.t 2012-05-22 14:37:08.000000000 +0100
+@@ -27,7 +27,7 @@
+ ## in real usage; override the socket with a
+ ## special tied filehandle.
+ my $fh = do { local *FH; *FH };
+-tie $fh, 'StringThing';
++tie *$fh, 'StringThing';
+ $ssh->{session}{sock} = $fh;
+
+ {
diff --git a/Net-SSH-Perl-1.34-SIGNATURE.patch
b/Net-SSH-Perl-1.34-SIGNATURE.patch
new file mode 100644
index 0000000..f9d3cc0
--- /dev/null
+++ b/Net-SSH-Perl-1.34-SIGNATURE.patch
@@ -0,0 +1,39 @@
+--- SIGNATURE
++++ SIGNATURE
+@@ -12,7 +12,7 @@
+ not run its Makefile.PL or Build.PL.
+
+ -----BEGIN PGP SIGNED MESSAGE-----
+-Hash: RIPEMD160
++Hash: SHA1
+
+ SHA1 cc451367f759ef30c8200859b4248973a973b623 .perlcriticrc
+ SHA1 c6482212ac6da98ebfe5fed713c5c8881433db31 Changes
+@@ -81,21 +81,22 @@
+ SHA1 9c829bf4def16354b48bc7bbda175977189abaf7 t/00-signature.t
+ SHA1 3008e62c337b38c20f99cd16ac08b8404e3abd55 t/01-compile.t
+ SHA1 18aab716396b7ca266475b84081bc0039eeeca06 t/02-buffer.t
+-SHA1 b816d5d743a461e0ad0d7ea483d0c91ab8716328 t/03-packet.t
++SHA1 2b9cb70983af39ac6a0c04b0ea50969d91c10e16 t/03-packet.t
+ SHA1 77b008f9141bb8b35e1020b33111bfdbe0250c15 t/04-config.t
+ SHA1 b1dc7d238503bee0469e014a9e1b6bee547e9334 t/05-cipher.t
+ SHA1 42eb8620bd0be0c5a9ca24b83f3630c8e46500c6 t/06-auth.t
+ SHA1 4b6e3d6741b2d5e021149da57478e0998c1ea9ef t/06-circular.t
+ SHA1 8d29c2b28ee840cfa6faf6a69985cb87e9ce6725 t/99-perlcritic.t
+ SHA1 53040aca85aa82e3504d6559cdb0dfee54ea92fc t/99-pod.t
+-SHA1 a65c49dc6e81c8d0b6514bf2d313e0b110aa224f t/99-spellcheck.t
++SHA1 56183699d4fdde6ffbceacbe7d09ef65a42d22db t/99-spellcheck.t
+ SHA1 e78d0a391329bf520fdc748d38002725dca4164c t/99-yaml.t
+ SHA1 9a32e630c87d1cc3ceaf2b5585519b55d12b79d3 t/config
+ SHA1 885358760910acc3898301c9af18cd634ddd81a8 t/psshd
+ SHA1 9b7aa51c0e3a2fede4a7b4767c3d507f37f46696 t/test-common.pl
+ -----BEGIN PGP SIGNATURE-----
++Version: GnuPG v1.4.12 (GNU/Linux)
+
+-iEYEAREDAAYFAkmGSf4ACgkQvJuQZxSWSsi5OQCgxH2dv4daZtlsv4DiyC8LMTUS
+-a1sAnA6DWrTXcknq0aLBamQtuZW26CcE
+-=ew0K
++iD8DBQFP8WKDemWSzxYcBrERAjsIAJ9KT7Mzmjd097Mn9G4mTvQ0lkENYwCgk1XX
++cmUPHyJLXxTUZ1Nte1kxiIo=
++=ryFR
+ -----END PGP SIGNATURE-----
diff --git a/Net-SSH-Perl-1.34-stopwords.patch
b/Net-SSH-Perl-1.34-stopwords.patch
index 87b9e09..ac4ca3e 100644
--- a/Net-SSH-Perl-1.34-stopwords.patch
+++ b/Net-SSH-Perl-1.34-stopwords.patch
@@ -57,35 +57,3 @@ diff -up
Net-SSH-Perl/Net-SSH-Perl-1.34/t/99-spellcheck.t.orig Net-SSH-Perl/Net-
untainting
username
usr
-diff -up Net-SSH-Perl/Net-SSH-Perl-1.34/SIGNATURE.orig
Net-SSH-Perl/Net-SSH-Perl-1.34/SIGNATURE
---- Net-SSH-Perl/Net-SSH-Perl-1.34/SIGNATURE.orig 2009-02-02
01:18:54.000000000 +0000
-+++ Net-SSH-Perl/Net-SSH-Perl-1.34/SIGNATURE 2011-06-23 09:36:26.091742983
+0100
-@@ -12,7 +12,7 @@ the distribution may already have been c
- not run its Makefile.PL or Build.PL.
-
- -----BEGIN PGP SIGNED MESSAGE-----
--Hash: RIPEMD160
-+Hash: SHA1
-
- SHA1 cc451367f759ef30c8200859b4248973a973b623 .perlcriticrc
- SHA1 c6482212ac6da98ebfe5fed713c5c8881433db31 Changes
-@@ -88,14 +88,15 @@ SHA1 42eb8620bd0be0c5a9ca24b83f3630c8e46
- SHA1 4b6e3d6741b2d5e021149da57478e0998c1ea9ef t/06-circular.t
- SHA1 8d29c2b28ee840cfa6faf6a69985cb87e9ce6725 t/99-perlcritic.t
- SHA1 53040aca85aa82e3504d6559cdb0dfee54ea92fc t/99-pod.t
--SHA1 a65c49dc6e81c8d0b6514bf2d313e0b110aa224f t/99-spellcheck.t
-+SHA1 56183699d4fdde6ffbceacbe7d09ef65a42d22db t/99-spellcheck.t
- SHA1 e78d0a391329bf520fdc748d38002725dca4164c t/99-yaml.t
- SHA1 9a32e630c87d1cc3ceaf2b5585519b55d12b79d3 t/config
- SHA1 885358760910acc3898301c9af18cd634ddd81a8 t/psshd
- SHA1 9b7aa51c0e3a2fede4a7b4767c3d507f37f46696 t/test-common.pl
- -----BEGIN PGP SIGNATURE-----
-+Version: GnuPG v1.4.11 (GNU/Linux)
-
--iEYEAREDAAYFAkmGSf4ACgkQvJuQZxSWSsi5OQCgxH2dv4daZtlsv4DiyC8LMTUS
--a1sAnA6DWrTXcknq0aLBamQtuZW26CcE
--=ew0K
-+iD8DBQFOAvsHemWSzxYcBrERAoXlAJ9M2eF4RBR+Y5vQZQfYJ/47VcoYhgCg9D5G
-+8GMxnZWjLHiN7KVpnYQmcZ0=
-+=yX94
- -----END PGP SIGNATURE-----
diff --git a/perl-Net-SSH-Perl.spec b/perl-Net-SSH-Perl.spec
index 610dd04..67fcb34 100644
--- a/perl-Net-SSH-Perl.spec
+++ b/perl-Net-SSH-Perl.spec
@@ -4,7 +4,7 @@
Summary: SSH (Secure Shell) client
Name: perl-Net-SSH-Perl
Version: 1.34
-Release: 15%{?dist}
+Release: 16%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
Url: http://search.cpan.org/dist/Net-SSH-Perl/
@@ -12,6 +12,8 @@ Source0:
http://search.cpan.org/CPAN/authors/id/T/TU/TURNSTEP/Net-SSH-Perl-%{ver
Source1: 14964AC8.asc
Source2: 161C06B1.asc
Patch0: Net-SSH-Perl-1.34-stopwords.patch
+Patch1: Net-SSH-Perl-1.34--perl5.16.patch
+Patch10: Net-SSH-Perl-1.34-SIGNATURE.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch
BuildRequires: perl(Carp)
@@ -28,18 +30,14 @@ BuildRequires: perl(Digest::HMAC_SHA1)
BuildRequires: perl(Digest::MD5)
BuildRequires: perl(Digest::SHA1) >= 2.10
BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: perl(Fcntl)
BuildRequires: perl(IO::Select)
BuildRequires: perl(IO::Socket)
BuildRequires: perl(Math::GMP) >= 1.04
BuildRequires: perl(Math::Pari) >= 2.001804
BuildRequires: perl(MIME::Base64)
-BuildRequires: perl(POSIX)
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Socket)
BuildRequires: perl(String::CRC32) >= 1.2
-BuildRequires: perl(Symbol)
-BuildRequires: perl(Sys::Hostname)
BuildRequires: perl(Test::More)
BuildRequires: perl(Tie::Handle)
# Additional test coverage
@@ -75,6 +73,16 @@ cd Net-SSH-Perl-%{version}
%patch0 -p2
cd -
+# Fix breakage with Perl 5.16 (CPAN RT#76482)
+cd Net-SSH-Perl-%{version}
+%patch1
+cd -
+
+# Replace SIGNATURE to account for changes from patches
+cd Net-SSH-Perl-%{version}
+%patch10
+cd -
+
# Copy up documentation for convenience with %%doc
cp -a Net-SSH-Perl-%{version}/{Changes,README,LICENSE,eg,ToDo} .
@@ -110,7 +118,6 @@ cd -
rm -rf %{buildroot}
make -C Net-SSH-Perl-%{version} pure_install DESTDIR=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
%{_fixperms} %{buildroot}
%check
@@ -140,6 +147,11 @@ rm -rf %{buildroot}
%{_mandir}/man3/Net::SSH::Perl*.3pm*
%changelog
+* Mon Jul 2 2012 Paul Howarth <p...@city-fan.org> 1.34-16
+- Fix breakage with Perl 5.16 (CPAN RT#76482)
+- Drop buildreqs for modules that are not dual-lived
+- Don't need to remove empty directories from the buildroot
+
* Mon Jul 02 2012 Petr Pisar <ppi...@redhat.com> - 1.34-15
- Perl 5.16 rebuild
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
