commit perl-Crypt-SSLeay

Hello community, here is the log from the commit of package perl-Crypt-SSLeay checked in at Fri Apr 4 01:42:05 CEST 2008. -------- --- perl-Crypt-SSLeay/perl-Crypt-SSLeay.changes 2007-07-16 18:23:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Crypt-SSLeay/perl-Crypt-SSLeay.changes 2008-04-03 16:11:56.251672000 +0200 @@ -1,0 +2,21 @@ +Thu Apr 3 16:10:44 CEST 2008 - ug@suse.de + +- version to 0.57 +- Honour both $ENV{NO_PROXY} and $ENV{no_proxy} in + Net::SSL::proxy_connect_helper. (Bug #29371 reported by Jan Dubois). +- $@ construction used in Net::SSL::connect was messed up, which could + lead to sub-optimal error reporting. (Bug #29372 reported by Jan + Dubois). +- Ensure no proxification is used in t/01-connect.t (which might be the + reason for all the spurious smoke failures). Bug #29373 reported by, + you guessed it, Jan Dubois). +- Silence a dubious fopen() warning in SSLeay.xs. +- s/Netware/NetWare/ in Net/SSL.pm platform check +- Improvements to Makefile.PL for dealing with platforms where openssl + is installed with ./include and ./lib as sibling directories rather + than child directories. This should allow the code to configure and + build "out of the box" on Solaris (and probably other proprietary + platforms). +- Don't carp in LICENSE key addition code in Makefile.PL + +------------------------------------------------------------------- Old: ---- Crypt-SSLeay-0.56.diff Crypt-SSLeay-0.56.tar.gz New: ---- Crypt-SSLeay-0.57.diff Crypt-SSLeay-0.57.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Crypt-SSLeay.spec ++++++ --- /var/tmp/diff_new_pack.N27951/_old 2008-04-04 01:40:49.000000000 +0200 +++ /var/tmp/diff_new_pack.N27951/_new 2008-04-04 01:40:49.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package perl-Crypt-SSLeay (Version 0.56) +# spec file for package perl-Crypt-SSLeay (Version 0.57) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,15 +10,16 @@ # norootforbuild + Name: perl-Crypt-SSLeay BuildRequires: openssl-devel License: Artistic License Group: Development/Libraries/Perl Requires: openssl Requires: perl = %{perl_version} -Autoreqprov: on +AutoReqProv: on Summary: perl module that provides LWP https support -Version: 0.56 +Version: 0.57 Release: 1 Source: Crypt-SSLeay-%{version}.tar.gz Patch: Crypt-SSLeay-%{version}.diff @@ -89,16 +90,34 @@ %doc %{_mandir}/man3/* %changelog -* Mon Jul 16 2007 - ug@suse.de +* Thu Apr 03 2008 ug@suse.de +- version to 0.57 +- Honour both $ENV{NO_PROXY} and $ENV{no_proxy} in + Net::SSL::proxy_connect_helper. (Bug #29371 reported by Jan Dubois). +- $@ construction used in Net::SSL::connect was messed up, which could + lead to sub-optimal error reporting. (Bug #29372 reported by Jan + Dubois). +- Ensure no proxification is used in t/01-connect.t (which might be the + reason for all the spurious smoke failures). Bug #29373 reported by, + you guessed it, Jan Dubois). +- Silence a dubious fopen() warning in SSLeay.xs. +- s/Netware/NetWare/ in Net/SSL.pm platform check +- Improvements to Makefile.PL for dealing with platforms where openssl + is installed with ./include and ./lib as sibling directories rather + than child directories. This should allow the code to configure and + build "out of the box" on Solaris (and probably other proprietary + platforms). +- Don't carp in LICENSE key addition code in Makefile.PL +* Mon Jul 16 2007 ug@suse.de - version update to 0.56 - too many changes. See Changes file for details -* Wed Oct 25 2006 - ug@suse.de +* Wed Oct 25 2006 ug@suse.de - openssl-devel removed from "Requires" -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Sat Nov 12 2005 - schwab@suse.de +* Sat Nov 12 2005 schwab@suse.de - Fix crash due to API change in SSL library [#129911]. -* Wed Sep 28 2005 - dmueller@suse.de +* Thu Sep 29 2005 dmueller@suse.de - add norootforbuild -* Mon Sep 01 2003 - ug@suse.de +* Mon Sep 01 2003 ug@suse.de - initial package ++++++ Crypt-SSLeay-0.56.diff -> Crypt-SSLeay-0.57.diff ++++++ ++++++ Crypt-SSLeay-0.56.tar.gz -> Crypt-SSLeay-0.57.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Crypt-SSLeay-0.56/Changes new/Crypt-SSLeay-0.57/Changes --- old/Crypt-SSLeay-0.56/Changes 2007-07-10 21:08:49.000000000 +0200 +++ new/Crypt-SSLeay-0.57/Changes 2007-09-17 22:49:12.000000000 +0200 @@ -1,6 +1,36 @@ Revision history for Crypt-SSLeay ================================= +0.57 2007-09-17 20:45:20 UTC + +- Honour both $ENV{NO_PROXY} and $ENV{no_proxy} in + Net::SSL::proxy_connect_helper. (Bug #29371 reported by Jan Dubois). +- $@ construction used in Net::SSL::connect was messed up, which could + lead to sub-optimal error reporting. (Bug #29372 reported by Jan + Dubois). +- Ensure no proxification is used in t/01-connect.t (which might be the + reason for all the spurious smoke failures). Bug #29373 reported by, + you guessed it, Jan Dubois). +- Silence a dubious fopen() warning in SSLeay.xs. +- s/Netware/NetWare/ in Net/SSL.pm platform check +- Improvements to Makefile.PL for dealing with platforms where openssl + is installed with ./include and ./lib as sibling directories rather + than child directories. This should allow the code to configure and + build "out of the box" on Solaris (and probably other proprietary + platforms). +- Don't carp in LICENSE key addition code in Makefile.PL + +0.56_01 2007-08-09 21:59:47 UTC + +- Various improvements to the Win32 configure code in Makefile.PL, + based on CPAN tickets #28431 and #28432, by Guenter Knauf, + notably to allow static linking and OpenSSL living in a relative + directory. +- Net::SSL: alarm() is not implemented on Netware platform, so don't + try to set one there. (Guenter Knauf). +- Should build on Solaris correctly (bug fix in include dir + specification). Based on fix suggested in CPAN bug #28680. + 0.56 2007-07-10 19:08:20 UTC - Purely a documentation issue raised by CPAN bug #27935. Users diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Crypt-SSLeay-0.56/lib/Net/SSL.pm new/Crypt-SSLeay-0.57/lib/Net/SSL.pm --- old/Crypt-SSLeay-0.56/lib/Net/SSL.pm 2007-05-19 16:58:01.000000000 +0200 +++ new/Crypt-SSLeay-0.57/lib/Net/SSL.pm 2007-09-17 21:56:52.000000000 +0200 @@ -6,7 +6,7 @@ use Carp; use vars qw(@ISA $VERSION $NEW_ARGS); -$VERSION = '2.81'; +$VERSION = '2.84'; require IO::Socket; @ISA=qw(IO::Socket::INET); @@ -24,7 +24,7 @@ } sub _alarm_set { - return if $^O eq 'MSWin32'; + return if $^O eq 'MSWin32' or $^O eq 'NetWare'; alarm(shift); } @@ -147,10 +147,10 @@ my $new_ssl = Net::SSL->new(%args); $REAL{$self} = $new_ssl; return $new_ssl; - } else { + } + else { # don't die, but do set $@, and return undef eval { $self->die_with_error("SSL negotiation failed") }; - $@ = "$@; $!"; croak($@); } } @@ -159,7 +159,7 @@ # odd error in eval {} block, maybe alarm outside the evals if($@) { - $! = "$@; $!"; + $@ = "$@; $!"; croak($@); } @@ -317,7 +317,7 @@ $peer_port || croak("no peer port given"); # see if the proxy should be bypassed - my @no_proxy = split( /\s*,\s*/, $ENV{'NO_PROXY'} || ''); + my @no_proxy = split( /\s*,\s*/, $ENV{NO_PROXY} || $ENV{no_proxy} || ''); my $is_proxied = 1; my $domain; for $domain (@no_proxy) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Crypt-SSLeay-0.56/Makefile.PL new/Crypt-SSLeay-0.57/Makefile.PL --- old/Crypt-SSLeay-0.56/Makefile.PL 2007-07-10 20:46:53.000000000 +0200 +++ new/Crypt-SSLeay-0.57/Makefile.PL 2007-09-17 22:36:59.000000000 +0200 @@ -9,11 +9,12 @@ eval "use ExtUtils::MakeMaker::Coverage"; $@ or print "Adding testcover target\n"; -use vars qw($opt_default $opt_libpath); +use vars qw($opt_default $opt_libpath $opt_static); GetOptions( "default", \$opt_default, "lib=s", \$opt_libpath, + "static", \$opt_static, ); $opt_default ||= $ENV{CRYPT_SSLEAY_DEFAULT}; @@ -35,27 +36,32 @@ else { # Unix and the rest @POSSIBLE_SSL_DIRS = qw( - /usr/local/openssl - /usr/local/ssl + /local /local/ssl /opt/ssl - /usr/local - /local /usr + /usr/local + /usr/local/ssl + /usr/local/openssl ); } -my @CANDIDATE = map {Candidate($_)} @POSSIBLE_SSL_DIRS; +my @CANDIDATE = do { + my %seen; + grep {!$seen{$_->{check}}++} + map {Candidate($_)} + @POSSIBLE_SSL_DIRS +}; if (@CANDIDATE == 0) { $opt_default = 0; my $bar = '=' x 72; - print <{dir}; } else { - print <{type} installation found at $pkg_config->{dir} Consider running 'perl Makefile.PL --default' the next @@ -119,7 +125,7 @@ # unknown directory, better check it out $pkg_config = Candidate($SSL_DIR); if (not $pkg_config) { - die <{inc}; $inc =~ tr{/}{\\}; - $inc !~ /^[a-z]:/i and $inc = "c:$inc"; + $inc = "c:$inc" if $inc !~ m{\A(?:[a-z]:|\.\.[\\/])}i; push @INC_FLAGS, "-I$inc"; push @INC_FLAGS, "-I$SSL_DIR\\inc32" if -d "$SSL_DIR/inc32"; @@ -157,13 +163,15 @@ elsif(-d "$SSL_DIR/lib") { push @LIB_FLAGS, "-L$SSL_DIR\\lib"; } - elsif(-d "$SSL_DIR/out32dll") { - # patch from Ben Laurie - push @LIB_FLAGS, "-L$SSL_DIR\\out32dll"; - } else { - # Allow developers to point at OpenSSL source... - push @LIB_FLAGS, "-L$SSL_DIR"; + my $dir = $opt_static ? "$SSL_DIR\\out32" : "$SSL_DIR\\out32dll"; + if (-d $dir) { + push @LIB_FLAGS, "-L$dir"; + } + else { + # Allow developers to point at OpenSSL source... + push @LIB_FLAGS, "-L$SSL_DIR"; + } } push @LIB_FLAGS, qw(-lssleay32 -llibeay32); @@ -172,7 +180,7 @@ else { push @INC_FLAGS, "-I$pkg_config->{inc}"; - push @LIB_FLAGS, "-L$SSL_DIR/lib", qw(-lssl -lcrypto -lgcc); + push @LIB_FLAGS, "-L$pkg_config->{lib}", qw(-lssl -lcrypto -lgcc); push @LIB_FLAGS, qw(-lRSAglue -lrsaref) if $pkg_config->{type} ne 'OpenSSL'; # ccc on alpha support @@ -188,26 +196,21 @@ } # write include file that determines ssl support -my $ssl_header_prefix = ($pkg_config->{inc} =~ /\bopenssl/i) - ? 'openssl/' - : '' -; - # we need to include crypto.h for SSLeay so the version gets picked up in SSLeay.xs open(INCLUDE, ">crypt_ssleay_version.h") || die("can't open crypt_ssleay_version.h for writing: $!"); -print INCLUDE <{prefix}ssl.h" +#include "$pkg_config->{prefix}crypto.h" +#include "$pkg_config->{prefix}err.h" +#include "$pkg_config->{prefix}rand.h" +#include "$pkg_config->{prefix}pkcs12.h" INFO if ($] < 5.005) { print "adding PL_sv_undef symbol for this ancient perl installation"; - print INCLUDE <{ver}; -if(($openssl_version =~ /^OpenSSL/) and ($openssl_version !~ /0\.9\.[2-5]/)) { - print INCLUDE "#define CRYPT_SSLEAY_free OPENSSL_free\n"; +if ($pkg_config->{type} eq 'OpenSSL') { + # OPENSSL_free defined in OpenSSL 0.9.6 and higher + if ($pkg_config->{ver} =~ /\b0\.9\.[2-5]/) { + print INCLUDE "#define CRYPT_SSLEAY_free free\n"; + } + else { + print INCLUDE "#define CRYPT_SSLEAY_free OPENSSL_free\n"; + } } else { print INCLUDE "#define CRYPT_SSLEAY_free free\n"; @@ -227,18 +234,22 @@ close INCLUDE or die "Cannot close crypt_ssleay_version.h for output: $!\n"; -print <{type} $pkg_config->{ver} in $SSL_DIR -ssl header: ${ssl_header_prefix}ssl.h +ssl header: $pkg_config->{prefix}ssl.h libraries: @LIB_FLAGS include dir: @INC_FLAGS ================================================ INFO -my @license = $ExtUtils::MakeMaker::VERSION > 6.30 +my @license = + do { + my $version = $ExtUtils::MakeMaker::VERSION; + $version =~ tr/_//d; + $version} > 6.30 ? qw(LICENSE perl) : (); @@ -257,14 +268,14 @@ ); if (open OUT, '> test.config') { - print OUT <{type} $pkg_config->{ver} in $SSL_DIR lib @LIB_FLAGS inc @INC_FLAGS cc $Config{cc} INFO - print < -1) { + # OpenSSL include directory is in a sibling directory + $inc_dir =~ s{\/openssl\z}{}; + $prefix = 'openssl/'; + } + else { + $prefix = ($inc_dir =~ /\bopenssl/i) ? 'openssl/' : ''; } open(VERSION_FILE, $version_file) or return; @@ -324,33 +347,48 @@ close(VERSION_FILE); # Silly test to look for the library files - my $foundlib = 0; + my $found_lib; my $libd; - if (-d "$dir/out32dll") { - $libd = 'out32dll'; + my $subdir = $opt_static ? 'out32' : 'out32dll'; + if (-d "$dir/$subdir") { + $libd = [$subdir]; } elsif ($^O eq 'MSWin32' and $Config{cc} eq 'gcc') { - $libd = 'lib/MinGW'; + $libd = ['lib/MinGW']; } else { - $libd = 'lib'; + # second attempt is for Solaris, like the include directory, the + # library directory may be in a sibling directory + $libd = ['lib', '../lib']; } - if (opendir(LIBDIR, "$dir/$libd")) { - while (defined($_ = readdir(LIBDIR))) { - if (/\A(?:lib(?:crypto|eay32|ssl)|ssleay32)/) { - $foundlib++; - last; + + SCAN: + for my $d (@$libd) { + my $lib_dir = "$dir/$d"; + if (opendir(LIBDIR, $lib_dir)) { + while (defined($_ = readdir(LIBDIR))) { + if (/\A(?:lib(?:crypto|eay32|ssl)|ssleay32)/) { + $found_lib = $lib_dir; + last SCAN; + } } + closedir(LIBDIR); } - closedir(LIBDIR); } - print "$dir/$libd does not seem to contain the SSLeay library files\n" - unless $foundlib; + + if (!$found_lib) { + my @tried = join( ',' => map {"$dir/$_"} @$libd); + print "Did not locate expected SSL library files in @tried\n"; + } return { - dir => $dir, - inc => $inc_dir, - ver => $version, - type => $type, + dir => $dir, + inc => $inc_dir, + lib => $found_lib, + ver => $version, + type => $type, + prefix => $prefix, + check => $fingerprint, }; } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Crypt-SSLeay-0.56/META.yml new/Crypt-SSLeay-0.57/META.yml --- old/Crypt-SSLeay-0.56/META.yml 2007-07-10 21:12:36.000000000 +0200 +++ new/Crypt-SSLeay-0.57/META.yml 2007-09-17 22:50:22.000000000 +0200 @@ -1,9 +1,9 @@ --- #YAML:1.0 name: Crypt-SSLeay -version: 0.56 +version: 0.57 abstract: OpenSSL support for LWP license: perl -generated_by: ExtUtils::MakeMaker version 6.32 +generated_by: ExtUtils::MakeMaker version 6.36_01 distribution_type: module requires: meta-spec: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Crypt-SSLeay-0.56/SSLeay.pm new/Crypt-SSLeay-0.57/SSLeay.pm --- old/Crypt-SSLeay-0.56/SSLeay.pm 2007-07-10 21:10:27.000000000 +0200 +++ new/Crypt-SSLeay-0.57/SSLeay.pm 2007-09-17 22:48:05.000000000 +0200 @@ -2,7 +2,7 @@ use strict; use vars '$VERSION'; -$VERSION = '0.56'; +$VERSION = '0.57'; eval { require XSLoader; @@ -58,8 +58,8 @@ =head1 DESCRIPTION -This document describes CCrypt::SSLeay version 0.56, released -2007-07-10. +This document describes CCrypt::SSLeay version 0.57, released +2007-09-17. This perl module provides support for the https protocol under LWP, to allow an CLWP::UserAgent object to perform GET, HEAD and POST @@ -368,6 +368,10 @@ Thanks to Jeff Lavallee for help with alarms on read failures (CPAN bug #12444). +Thanks to Guenter Knauf for significant improvements in configuring +things in Win32 and Netware lands and Jan Dubois for various +suggestions for improvements. + =head1 SEE ALSO =over 4 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Crypt-SSLeay-0.56/SSLeay.xs new/Crypt-SSLeay-0.57/SSLeay.xs --- old/Crypt-SSLeay-0.56/SSLeay.xs 2007-03-02 20:39:18.000000000 +0100 +++ new/Crypt-SSLeay-0.57/SSLeay.xs 2007-08-13 19:42:33.000000000 +0200 @@ -172,7 +172,7 @@ STACK_OF(X509) *ca = NULL; PKCS12 *p12; CODE: - if (fp = fopen(filename, "rb")) { + if ((fp = fopen(filename, "rb"))) { p12 = d2i_PKCS12_fp(fp, NULL); fclose (fp); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Crypt-SSLeay-0.56/t/01-connect.t new/Crypt-SSLeay-0.57/t/01-connect.t --- old/Crypt-SSLeay-0.56/t/01-connect.t 2007-05-19 16:58:19.000000000 +0200 +++ new/Crypt-SSLeay-0.57/t/01-connect.t 2007-09-17 21:59:47.000000000 +0200 @@ -3,6 +3,9 @@ use Net::SSL; +# ensure no proxification takes place +$ENV{NO_PROXY} = '127.0.0.1'; + my $sock; eval { $sock = Net::SSL->new( ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org