- update to 1.32, incorporate new upstream URLs

- cosmetic spec changes suiting new maintainer's preferences - fix argument order for find with -depth - remove patch for CVE-2005-0106, fixed upstream in 1.30 (#191351) (http://rt.cpan.org/Public/Bug/Display.html?id=19218) - remove test patch, no longer needed - re-encode Credits as UTF-8 - include TODO as %doc - add buildreqs perl(Array::Compare), perl(MIME::Base64), perl(Sub::Uplevel), perl(Test::Exception), perl(Test::NoWarnings), perl(Test::Pod), perl(Test::Warn), perl(Tree::DAG_Node) - add patch needed to disable testsuite non-interactively - run test suite but disable external tests by default; external tests can be enabled by using rpmbuild --with externaltests - add patch to change hosts connected to in external tests
2007-11-28 15:38:29 +00:00 · 2007-11-28 15:38:29 +00:00 · ef0a04943b
commit ef0a04943b
parent 8ab436bbe2
7 changed files with 86 additions and 80 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-Net_SSLeay.pm-1.30.tar.gz
+Net-SSLeay-1.32.tar.gz
--- a/perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch
+++ b/perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch
@ -1,21 +0,0 @@
--- Net_SSLeay.pm-1.25/SSLeay.pm.cve-2005-0106	2006-01-25 12:37:11.540102265 -0700
-+++ Net_SSLeay.pm-1.25/SSLeay.pm	2006-01-25 12:38:16.994260984 -0700
-@@ -1853,8 +1853,8 @@
-     my ($rn_seed_file, $seed, $egd_path) = @_;
-     my $rnsf = defined($rn_seed_file) && -r $rn_seed_file;
- 
-+    $egd_path = '';
-     $egd_path = $ENV{'EGD_PATH'} if $ENV{'EGD_PATH'};
-    $egd_path = '/tmp/entropy'   unless $egd_path;
-     
-     RAND_seed(rand() + $$);  # Stir it with time and pid
-     
-@@ -1865,7 +1865,7 @@
-     RAND_load_file($rn_seed_file, -s _) if $rnsf;
-     RAND_seed($seed) if $seed;
-     RAND_seed($ENV{RND_SEED}) if $ENV{RND_SEED};
-    RAND_egd($egd_path) if -S $egd_path;
-+    RAND_egd($egd_path) if -e $egd_path && -S $egd_path;
-     RAND_load_file($Net::SSLeay::random_device, $Net::SSLeay::how_random/8)
- 	if -r $Net::SSLeay::random_device;
- }
--- a/perl-Net-SSLeay-1.32-external-hosts.patch
+++ b/perl-Net-SSLeay-1.32-external-hosts.patch
@ -0,0 +1,15 @@
+--- Net-SSLeay-1.32/t/handle/external/10_destroy.t	2007-11-28 15:11:57.000000000 +0000
+++ Net-SSLeay-1.32/t/handle/external/10_destroy.t	2007-11-28 15:10:59.000000000 +0000
+@@ -5,9 +5,9 @@
+ use Test::More;
+ 
+ my @uris = qw(
+-        debianforum.de
+-        bacus.pt
+-        perldition.org
+        admin.fedoraproject.org
+        bugzilla.redhat.com
+        www.redhat.com
+ );
+ 
+ plan tests => scalar @uris * 2;
--- a/perl-Net-SSLeay-1.32-notests.patch
+++ b/perl-Net-SSLeay-1.32-notests.patch
@ -0,0 +1,11 @@
+--- Net-SSLeay-1.32/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2007-11-28 14:25:12.000000000 +0000
+++ Net-SSLeay-1.32/inc/Module/Install/PRIVATE/Net/SSLeay.pm	2007-11-28 14:19:28.000000000 +0000
+@@ -48,7 +48,7 @@
+     if ( $self->prompt(
+             "Do you want to run external tests?\n".
+             "These tests *will* *fail* if you do not have network connectivity.",
+-            'y',
+            'n',
+     ) =~ /^y/i ) {
+         $self->tests('t/*/*.t t/*/*/*.t');
+     } else {
--- a/perl-Net-SSLeay-test14.patch
+++ b/perl-Net-SSLeay-test14.patch
@ -1,11 +0,0 @@
--- test.pl~	2003-08-17 10:27:54.000000000 +0300
-+++ test.pl	2004-10-12 00:19:42.761693459 +0300
-@@ -187,7 +187,7 @@
- $ENV{RND_SEED} = '1234567890123456789012345678901234567890';
- print &test('14 www.bacus.pt',
- 	    &Net::SSLeay::sslcat("www.bacus.pt", 443,
-				 "get\n\r\n\r") =~ /<TITLE>/);
-+				 "get\n\r\n\r") =~ /<TITLE>/i);
- 
- sub test_site ($$) {
-     my ($test_nro, $site) = @_;
--- a/perl-Net-SSLeay.spec
+++ b/perl-Net-SSLeay.spec
@ -1,24 +1,23 @@
 #
 # Rebuild switch:
-#  --with testsuite          enable test suite
+#	--with externaltests	enable external network tests
 #

-Name:           perl-Net-SSLeay
-Version:        1.30
-Release:        7%{?dist}
-Summary:        Perl extension for using OpenSSL
-
-Group:          Development/Libraries
-License:        OpenSSL
-URL:            http://search.cpan.org/dist/Net_SSLeay.pm/
-Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Net_SSLeay.pm-%{version}.tar.gz
-Patch0:         %{name}-test14.patch
-Patch1:         perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  openssl-devel
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Name:		perl-Net-SSLeay
+Version:	1.32
+Release:	1%{?dist}
+Summary:	Perl extension for using OpenSSL
+Group:		Development/Libraries
+License:	OpenSSL
+URL:		http://search.cpan.org/dist/Net-SSLeay/
+Source0:	http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Net-SSLeay-%{version}.tar.gz
+Patch0:		perl-Net-SSLeay-1.32-notests.patch
+Patch1:		perl-Net-SSLeay-1.32-external-hosts.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:	perl(ExtUtils::MakeMaker), openssl-devel
+BuildRequires:	perl(Array::Compare), perl(MIME::Base64), perl(Sub::Uplevel)
+BuildRequires:	perl(Test::Exception), perl(Test::NoWarnings), perl(Test::Pod), perl(Test::Warn), perl(Tree::DAG_Node)

 %description
 This module offers some high level convenience functions for accessing
@ -27,56 +26,69 @@ accessing http servers, too), a sslcat() function for writing your own
 clients, and finally access to the SSL api of SSLeay/OpenSSL package
 so you can write servers or clients for more complicated applications.

-
 %prep
-%setup -q -n Net_SSLeay.pm-%{version}
-%patch0 -p0
-%patch1 -p1
-cp -p Net-SSLeay-Handle-*/Changes Changes.Net-SSLeay-Handle
-chmod -c 644 examples/*
+%setup -q -n Net-SSLeay-%{version}
+%if 0%{!?_with_externaltests:1}
+%patch0 -p1 -b .notests
+%endif
+%patch1 -p1 -b .hosts
+%{__chmod} -c 644 examples/*
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' examples/*.pl
-iconv -f iso-8859-1 -t utf-8 SSLeay.pm > SSLeay.pm.utf8
-mv SSLeay.pm.utf8 SSLeay.pm
-
+for f in Credits lib/Net/SSLeay.pm; do
+	/usr/bin/iconv -f iso-8859-1 -t utf-8 ${f} > ${f}.utf8
+	%{__mv} ${f}.utf8 ${f}
+done

 %build
-%{__perl} Makefile.PL -- INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
-make %{?_smp_mflags}
-
+PERL_MM_USE_DEFAULT=1 %{__perl} Makefile.PL \
+	INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+%{__make} %{?_smp_mflags}

 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/Net/ptrtstrun.pl
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+%{__rm} -rf %{buildroot}
+%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -type f -name '*.bs' -empty -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -depth -type d -exec %{__rmdir} {} 2>/dev/null ';'
+%{__rm} -f %{buildroot}%{perl_vendorarch}/Net/ptrtstrun.pl
+%{__chmod} -R u+w %{buildroot}/*

 %check
-# spawns servers, contacts external sites...
-%{?_with_testsuite:make test}
-
+%{__make} test

 %clean
-rm -rf $RPM_BUILD_ROOT
-
+%{__rm} -rf %{buildroot}

 %files
 %defattr(-,root,root,-)
-%doc Changes* Credits QuickRef README examples/
+%doc Changes Credits QuickRef README examples/ TODO
 %{perl_vendorarch}/auto/Net/
 %{perl_vendorarch}/Net/
 %{_mandir}/man3/Net::SSLeay*.3*

-
 %changelog
+* Wed Nov 28 2007 Paul Howarth <paul@city-fan.org> - 1.32-1
+- update to 1.32, incorporate new upstream URLs
+- cosmetic spec changes suiting new maintainer's preferences
+- fix argument order for find with -depth
+- remove patch for CVE-2005-0106, fixed upstream in 1.30 (#191351)
+  (http://rt.cpan.org/Public/Bug/Display.html?id=19218)
+- remove test patch, no longer needed
+- re-encode Credits as UTF-8
+- include TODO as %%doc
+- add buildreqs perl(Array::Compare), perl(MIME::Base64), perl(Sub::Uplevel),
+  perl(Test::Exception), perl(Test::NoWarnings), perl(Test::Pod),
+  perl(Test::Warn), perl(Tree::DAG_Node)
+- add patch needed to disable testsuite non-interactively
+- run test suite but disable external tests by default; external tests can be
+  enabled by using rpmbuild --with externaltests
+- add patch to change hosts connected to in external tests
+
 * Fri Nov 16 2007 Parag Nemade <panemade@gmail.com> - 1.30-7
- Merge Review(#226272) Spec cleanup
+- Merge Review (#226272) Spec cleanup

 * Tue Nov  6 2007 Stepan Kasal <skasal@redhat.com> - 1.30-6
- fix a typo in description
+- fix a typo in description (#231756, #231757)

 * Tue Oct 16 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 1.30-5.1
 - correct license tag
--- a/2
+++ b/2
@ -1 +1 @@
-b0cd6c1681bbc0695d81be5cd852d1d0  Net_SSLeay.pm-1.30.tar.gz
+3e0918a7101633f06cfe4f7ca005917e  Net-SSLeay-1.32.tar.gz