From 6756625f75965022a86d5568fdcc9bb26e49c223 Mon Sep 17 00:00:00 2001 From: Paul Howarth paul@city-fan.org Date: Wed, 16 Nov 2016 09:08:17 +0000 Subject: Enable IDEA support unconditionally (patent expired a few years ago)
--- perl-Net-SSH-Perl.spec | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-)
diff --git a/perl-Net-SSH-Perl.spec b/perl-Net-SSH-Perl.spec index 366ab63..b9759b6 100644 --- a/perl-Net-SSH-Perl.spec +++ b/perl-Net-SSH-Perl.spec @@ -1,13 +1,7 @@ -# IDEA is a patent-encumbered algorithm so default to not supporting it -# To include support for the IDEA algorithm, use: rpmbuild --with IDEA - -# Provides/Requires filtering is different from rpm 4.9 onwards -%global rpm49 0%(rpm --version | perl -p -e 's/^.* (\d+)\.(\d+).*/sprintf("%d.%03d",$1,$2) ge 4.009 ? 1 : 0/e') - Summary: SSH (Secure Shell) client Name: perl-Net-SSH-Perl Version: 1.42 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL+ or Artistic Group: Development/Libraries Url: http://search.cpan.org/dist/Net-SSH-Perl/ @@ -37,6 +31,7 @@ BuildRequires: perl(Crypt::DH) >= 0.01 BuildRequires: perl(Crypt::DSA) >= 0.11 BuildRequires: perl(Crypt::DSA::Key) BuildRequires: perl(Crypt::DSA::Signature) +BuildRequires: perl(Crypt::IDEA) BuildRequires: perl(Crypt::RSA) BuildRequires: perl(Crypt::RSA::Key) BuildRequires: perl(Crypt::RSA::Key::Private) @@ -93,14 +88,6 @@ Requires: perl(File::Basename) Requires: perl(File::Path) Requires: perl(Term::ReadKey)
-# If building with IDEA support, we need to build with Crypt::IDEA, -# otherwise we need to filter out the dependency on it -%if 0%{?_with_IDEA:1} -BuildRequires: perl(Crypt::IDEA) -%else -%global __requires_exclude ^perl\(Crypt::IDEA\) -%endif - %description Net::SSH::Perl is an all-Perl module implementing an SSH (Secure Shell) client. It is compatible with both the SSH-1 and SSH-2 protocols. @@ -119,13 +106,6 @@ mkdir --mode=0700 gnupghome export GNUPGHOME=$(pwd)/gnupghome gpg --import %{SOURCE4}
-# Remove Crypt::IDEA dep if we're not supporting the IDEA algorithm and we don't have rpm 4.9 -%if ! %{rpm49} -%global bogusreq 'perl(Crypt::IDEA)' -%global reqfilt /bin/sh -c "%{__perl_requires} | grep -Fvx %{bogusreq}" -%{!?_with_IDEA:%global __perl_requires %{reqfilt}} -%endif - %build cd Net-SSH-Perl-%{version} ( @@ -135,7 +115,7 @@ cd Net-SSH-Perl-%{version}
# Algorithm selection (select all required) # 1=IDEA 2=DES 3=DES3 4=Blowfish 5=RC4 - echo %{?_with_IDEA:1 }2 3 4 5 + echo 1 2 3 4 5 ) | perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -144,8 +124,8 @@ cd - %install rm -rf %{buildroot} make -C Net-SSH-Perl-%{version} pure_install DESTDIR=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -%{_fixperms} %{buildroot} +find %{buildroot} -type f -name .packlist -delete +%{_fixperms} -c %{buildroot}
%check # Critic and POD tests currently fail @@ -172,6 +152,9 @@ rm -rf %{buildroot} %{_mandir}/man3/Net::SSH::Perl*.3*
%changelog +* Wed Nov 16 2016 Paul Howarth paul@city-fan.org - 1.42-6 +- Enable IDEA support unconditionally (patent expired a few years ago) + * Fri Jul 22 2016 Petr Pisar ppisar@redhat.com - 1.42-5 - Adjust RPM version detection to SRPM build root without perl
perl-devel@lists.fedoraproject.org