update to p5-Net-SSLeay 1.32, ok sturm@

2008-04-26 16:37:33 +00:00 · 2008-04-26 16:37:33 +00:00 · d1ee9e0ef4
commit d1ee9e0ef4
parent 1c1984617f
8 changed files with 97 additions and 51 deletions
--- a/security/p5-Net_SSLeay/Makefile
+++ b/security/p5-Net_SSLeay/Makefile
@ -1,23 +1,27 @@
-# $OpenBSD: Makefile,v 1.25 2007/09/15 23:30:00 merdely Exp $
+# $OpenBSD: Makefile,v 1.26 2008/04/26 16:37:33 bluhm Exp $

-SHARED_ONLY=	Yes
+SHARED_ONLY=		Yes

-COMMENT=	perl module for using OpenSSL
+COMMENT=		perl module for using OpenSSL

-MODULES=	cpan
-VERSION=	1.30
-DISTNAME=	Net_SSLeay.pm-${VERSION}
-PKGNAME=	p5-Net-SSLeay-${VERSION}p0
-CATEGORIES=	security
+DISTNAME=		Net-SSLeay-1.32

-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
+CATEGORIES=		security

 # same terms as OpenSSL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		crypto ssl
+
+WANTLIB=		crypto ssl z
+
+MODULES=		cpan
+REGRESS_DEPENDS=	::devel/p5-Test-Exception \
+			::devel/p5-Test-Warn \
+			::devel/p5-Test-NoWarnings \
+			::devel/p5-Test-Pod \
+			::devel/p5-Test-Pod-Coverage

 PLDIR=	${PREFIX}/share/examples/p5-Net-SSLeay
 SRCDIR=	${WRKSRC}/examples
--- a/security/p5-Net_SSLeay/distinfo
+++ b/security/p5-Net_SSLeay/distinfo
@ -1,5 +1,5 @@
-MD5 (Net_SSLeay.pm-1.30.tar.gz) = sM1sFoG7wGldgb5c2FLR0A==
-RMD160 (Net_SSLeay.pm-1.30.tar.gz) = 0WD35R8WIBiAsLl+KRSUMpGhrH4=
-SHA1 (Net_SSLeay.pm-1.30.tar.gz) = wCCvVWpD2DZ1uuRBnWOjSt4wq4E=
-SHA256 (Net_SSLeay.pm-1.30.tar.gz) = QIRV9g5hau0N76jwpr62/+ohnTqP20Njca+gprNcOMU=
-SIZE (Net_SSLeay.pm-1.30.tar.gz) = 78629
+MD5 (Net-SSLeay-1.32.tar.gz) = PgkYpxAWM/Bs/k98oAWRfg==
+RMD160 (Net-SSLeay-1.32.tar.gz) = YUA6dSlib2xWJ5DANGWa+YyeKeE=
+SHA1 (Net-SSLeay-1.32.tar.gz) = 5XxsNvDfe/IRxDWjgzDeLpPRQbs=
+SHA256 (Net-SSLeay-1.32.tar.gz) = jnwexo6joKxBeA7xUL24qLmC9GBmxUKpo5/jlaiDRPo=
+SIZE (Net-SSLeay-1.32.tar.gz) = 130187
--- a/security/p5-Net_SSLeay/patches/patch-Makefile_PL
+++ b/security/p5-Net_SSLeay/patches/patch-Makefile_PL
@ -1,12 +1,15 @@
-$OpenBSD: patch-Makefile_PL,v 1.4 2006/01/21 18:02:56 sturm Exp $
--- Makefile.PL.orig	Sun Aug 17 09:12:55 2003
-+++ Makefile.PL	Sat Jan 21 18:57:39 2006
-@@ -46,7 +46,7 @@ $openssl_path = '/opt/ssl' if -x '/opt/s
-     || -x '/opt/ssl/sbin/openssl';
- $openssl_path = '/usr/local/ssl' if -x '/usr/local/ssl/bin/openssl';
- $openssl_path = '/apps/openssl/std' if -x '/apps/openssl/std/bin/openssl';
-$openssl_path = shift if @ARGV && $ARGV[0] ne '--';
-+#$openssl_path = shift if @ARGV && $ARGV[0] ne '--';
+$OpenBSD: patch-Makefile_PL,v 1.5 2008/04/26 16:37:33 bluhm Exp $
+--- Makefile.PL.orig	Sat Jul 14 22:01:26 2007
+++ Makefile.PL	Mon Apr 21 21:26:26 2008
+@@ -10,11 +10,6 @@ all_from('lib/Net/SSLeay.pm');
 
- shift if $ARGV[0] eq '--';   # Rest of args are for MakeMaker
+ ssleay();
 
+-build_requires('Sub::Uplevel');
+-build_requires('Test::Exception');
+-build_requires('Array::Compare');
+-build_requires('Tree::DAG_Node');
+-build_requires('Test::Warn');
+ requires('MIME::Base64');
+ 
+ clean_files(map { fixpath($_) } qw(
--- a/security/p5-Net_SSLeay/patches/patch-SSLeay_pm
+++ b/security/p5-Net_SSLeay/patches/patch-SSLeay_pm
@ -1,22 +0,0 @@
-$OpenBSD: patch-SSLeay_pm,v 1.1 2006/01/21 18:02:56 sturm Exp $
--- SSLeay.pm.orig	Sat Jan 21 18:58:09 2006
-+++ SSLeay.pm	Sat Jan 21 18:58:31 2006
-@@ -1853,8 +1853,8 @@ sub randomize (;$$) {
-     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 @@ sub randomize (;$$) {
-     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 _;
-     RAND_load_file($Net::SSLeay::random_device, $Net::SSLeay::how_random/8)
- 	if -r $Net::SSLeay::random_device;
- }
--- a/security/p5-Net_SSLeay/patches/patch-t_handle_external_10_destroy_t
+++ b/security/p5-Net_SSLeay/patches/patch-t_handle_external_10_destroy_t
@ -0,0 +1,47 @@
+$OpenBSD: patch-t_handle_external_10_destroy_t,v 1.1 2008/04/26 16:37:33 bluhm Exp $
+--- t/handle/external/10_destroy.t.orig	Tue Jul  3 15:53:43 2007
+++ t/handle/external/10_destroy.t	Sat Sep 29 13:41:51 2007
+@@ -10,7 +10,7 @@ my @uris = qw(
+         perldition.org
+ );
+ 
+-plan tests => scalar @uris * 2;
+plan tests => scalar @uris * 3;
+ 
+ use File::Spec;
+ use Symbol qw(gensym);
+@@ -27,17 +27,25 @@ for my $uri (@uris) {
+ my $fdcount_start = count_fds();
+ 
+ for my $uri (@uris) {
+-    {
+-        my $ssl = gensym();
+-        tie(*$ssl, "Net::SSLeay::Handle", $uri, 443);
+-        print $ssl "GET / HTTP/1.0\r\n\r\n";
+    SKIP: {
+	{
+	    my $ssl = gensym();
+	    eval {
+		tie(*$ssl, "Net::SSLeay::Handle", $uri, 443);
+	    };
+ 
+-        my $response = do { local $/ = undef; <$ssl> };
+-        like( $response, qr/^HTTP\/1/s, 'correct response' );
+-    }
+	    skip('could not connect', 3) if $@;
+	    pass('connection');
+ 
+-    my $fdcount_end = count_fds();
+-    is ($fdcount_end, $fdcount_start, 'handle gets destroyed when it goes out of scope');
+	    print $ssl "GET / HTTP/1.0\r\n\r\n";
+
+	    my $response = do { local $/ = undef; <$ssl> };
+	    like( $response, qr/^HTTP\/1/s, 'correct response' );
+	}
+
+	my $fdcount_end = count_fds();
+	is ($fdcount_end, $fdcount_start, 'handle gets destroyed when it goes out of scope');
+    }
+ }
+ 
+ sub count_fds {
--- a/security/p5-Net_SSLeay/patches/patch-t_handle_external_50_external_t
+++ b/security/p5-Net_SSLeay/patches/patch-t_handle_external_50_external_t
@ -0,0 +1,15 @@
+$OpenBSD: patch-t_handle_external_50_external_t,v 1.1 2008/04/26 16:37:33 bluhm Exp $
+--- t/handle/external/50_external.t.orig	Tue Jul  3 15:53:43 2007
+++ t/handle/external/50_external.t	Sat Sep 29 13:41:51 2007
+@@ -49,8 +49,10 @@ for my $site (@sites) {
+         }
+     }
+ 
+-    for my $sock (@sock) {
+    for (my $i = 0; $i < scalar @sites; $i++) {
+         SKIP : {
+            my $sock = $sock[$i];
+
+             skip('not connected', 2) unless defined $sock;
+             pass('connected');
+ 
--- a/security/p5-Net_SSLeay/pkg/DESCR
+++ b/security/p5-Net_SSLeay/pkg/DESCR
@ -1,4 +1,4 @@
 This module offers some high level convenience functions for accessing
 web pages on SSL servers, a sslcat() function for writing your own
-clients, and finally access to the SSL api of SSLeay package so you can
-write servers or clients for more complicated applications.
+clients, and finally access to the SSL api of SSLeay/OpenSSL package
+so you can write servers or clients for more complicated applications.
--- a/security/p5-Net_SSLeay/pkg/PLIST
+++ b/security/p5-Net_SSLeay/pkg/PLIST
@ -1,10 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.11 2005/01/27 03:27:04 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.12 2008/04/26 16:37:34 bluhm Exp $
 ${P5ARCH}/
 ${P5ARCH}/Net/
 ${P5ARCH}/Net/SSLeay/
 ${P5ARCH}/Net/SSLeay.pm
 ${P5ARCH}/Net/SSLeay/Handle.pm
-${P5ARCH}/Net/ptrtstrun.pl
 ${P5ARCH}/auto/
 ${P5ARCH}/auto/Net/
 ${P5ARCH}/auto/Net/SSLeay/