rpms/perl-Net-SSLeay/FC-4 perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch, NONE, 1.1 perl-Net-SSLeay.spec, 1.4, 1.5

[Jose Pedro Oliveira (jpo)]

Author: jpo

Update of /cvs/extras/rpms/perl-Net-SSLeay/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3726/FC-4

Modified Files:
	perl-Net-SSLeay.spec 
Added Files:
	perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch 
Log Message:
CVE-2005-0106 (#191351)

perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch:

--- NEW FILE perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch ---
--- 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;
 }


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/FC-4/perl-Net-SSLeay.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Net-SSLeay.spec	6 Apr 2005 22:13:07 -0000	1.4
+++ perl-Net-SSLeay.spec	11 May 2006 19:15:36 -0000	1.5
@@ -1,9 +1,11 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
+#
+# Rebuild switch:
+#  --with testsuite          enable test suite
+#
 
 Name:           perl-Net-SSLeay
 Version:        1.26
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Perl extension for using OpenSSL
 
 Group:          Development/Libraries
@@ -11,10 +13,12 @@
 URL:            http://search.cpan.org/dist/Net_SSLeay.pm/
 Source0:        http://www.fas.harvard.edu/~behrooz/Net_SSLeay.pm-1.26.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 >= 1:5.6.1, openssl-devel
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  openssl-devel
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Provides:       perl-Net_SSLeay = %{version}-%{release}
 
 %description
@@ -28,29 +32,32 @@
 %prep
 %setup -q -n Net_SSLeay.pm-%{version}
 %patch0 -p0
+%patch1 -p1
 cp -p Net-SSLeay-Handle-*/Changes Changes.Net-SSLeay-Handle
-chmod 644 examples/*
+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
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL -- INSTALLDIRS=vendor
-%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL -- INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -a \( -name .packlist -o -name ptrtstrun.pl \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+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/*
 
 
-%check || :
-# make test # spawns servers, contacts external sites...
+%check
+# spawns servers, contacts external sites...
+%{?_with_testsuite:make test}
 
 
 %clean
@@ -59,14 +66,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes* Credits QuickRef README examples
-%{perl_vendorarch}/auto/Net
-%{perl_vendorarch}/Net
+%doc Changes* Credits QuickRef README examples/
+%{perl_vendorarch}/auto/Net/
+%{perl_vendorarch}/Net/
 %{_mandir}/man3/Net::SSLeay*.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu May 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.26-3
+- CVE-2005-0106 (#191351).
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.26-2
 - rebuilt
 
 * Mon Dec 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.26-1