diff options
| -rw-r--r-- | security/p5-Crypt-SSLeay/Makefile | 12 | ||||
| -rw-r--r-- | security/p5-Crypt-SSLeay/distinfo | 11 | ||||
| -rw-r--r-- | security/p5-Crypt-SSLeay/patches/patch-aa | 42 | ||||
| -rw-r--r-- | security/p5-Crypt-SSLeay/patches/patch-ab | 31 |
4 files changed, 20 insertions, 76 deletions
diff --git a/security/p5-Crypt-SSLeay/Makefile b/security/p5-Crypt-SSLeay/Makefile index 8e4320819be..83f05b4b59d 100644 --- a/security/p5-Crypt-SSLeay/Makefile +++ b/security/p5-Crypt-SSLeay/Makefile @@ -1,25 +1,21 @@ -# $NetBSD: Makefile,v 1.5 2006/11/05 17:35:58 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2007/06/08 07:57:10 wiz Exp $ # -DISTNAME= Crypt-SSLeay-0.51 +DISTNAME= Crypt-SSLeay-0.55 PKGNAME= p5-${DISTNAME} -PKGREVISION= 7 SVR4_PKGNAME= p5csl CATEGORIES= security perl5 www MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/} MAINTAINER= shell@NetBSD.org +HOMEPAGE= http://search.cpan.org/dist/Crypt-SSLeay/ COMMENT= Crypt::SSLeay - OpenSSL glue that provides LWP https support PKG_DESTDIR_SUPPORT= user-destdir PERL5_PACKLIST= auto/Crypt/SSLeay/.packlist -SUBST_CLASSES+= openssl -SUBST_STAGE.openssl= pre-configure -SUBST_MESSAGE.openssl= Fixing path to OpenSSL. -SUBST_FILES.openssl= Makefile.PL -SUBST_SED.openssl= -e 's|%%SSLBASE%%|${BUILDLINK_PREFIX.openssl}|g' +MAKE_PARAMS+= --lib=${SSLBASE} .include "../../lang/perl5/module.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/security/p5-Crypt-SSLeay/distinfo b/security/p5-Crypt-SSLeay/distinfo index 004cf7effc0..f7086637cdd 100644 --- a/security/p5-Crypt-SSLeay/distinfo +++ b/security/p5-Crypt-SSLeay/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.4 2006/10/28 15:14:59 schwarz Exp $ +$NetBSD: distinfo,v 1.5 2007/06/08 07:57:11 wiz Exp $ -SHA1 (Crypt-SSLeay-0.51.tar.gz) = dea8e37e2430e351688125f5a641d76f55dbe25c -RMD160 (Crypt-SSLeay-0.51.tar.gz) = 963ee2616742b3983a06eaee3059aafa9b866e0a -Size (Crypt-SSLeay-0.51.tar.gz) = 117555 bytes -SHA1 (patch-aa) = f79576ad49381a5fef228537502770f22ae00e41 -SHA1 (patch-ab) = e9e8da0c3604edfa5cfe10885dbe93c74198bcb5 +SHA1 (Crypt-SSLeay-0.55.tar.gz) = e31b9980c4170b6adc98d2d9a2d22acfa390e460 +RMD160 (Crypt-SSLeay-0.55.tar.gz) = 2ad8fc592ddfa494960d72a363fdf143d2d4eefc +Size (Crypt-SSLeay-0.55.tar.gz) = 121191 bytes +SHA1 (patch-aa) = 672d57add20123c1613998dad5d5d606176daadc diff --git a/security/p5-Crypt-SSLeay/patches/patch-aa b/security/p5-Crypt-SSLeay/patches/patch-aa index b0b46dd075a..da21e09c0b3 100644 --- a/security/p5-Crypt-SSLeay/patches/patch-aa +++ b/security/p5-Crypt-SSLeay/patches/patch-aa @@ -1,35 +1,15 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/01/20 20:08:53 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2007/06/08 07:57:11 wiz Exp $ ---- Makefile.PL.orig Sun Feb 9 14:08:27 2003 +--- Makefile.PL.orig 2007-06-01 17:33:24.000000000 +0000 +++ Makefile.PL -@@ -13,7 +13,7 @@ my $currdir = dirname($0) || '.'; - chdir($currdir) || die("can't change to $currdir: $!"); +@@ -261,9 +261,7 @@ behind a strict firewall or have no netw + these tests may fail (through no fault of the code). - # FIND POSSIBLE SSL INSTALLATIONS --my @POSSIBLE_SSL_DIRS = qw(/usr/local/openssl /usr/local/ssl /local/ssl /opt/ssl /usr/local /local /usr); -+my @POSSIBLE_SSL_DIRS = qw(%%SSLBASE%%); - if($^O eq 'MSWin32') { - unshift(@POSSIBLE_SSL_DIRS, 'c:/openssl'); + INFO +- my $network_tests = prompt +- "Do you want to run the live tests (y/N) ?", +- 'N'; ++ my $network_tests = 'N'; + print OUT "network_tests ", ($network_tests =~ /y/i) ? 1 : 0, "\n"; + close OUT; } -@@ -40,7 +40,8 @@ if (@CANDIDATE == 1) { - } - } - --my $SSL_DIR; -+my $SSL_DIR = $CANDIDATE[0][0]; -+<<__SKIP__; - if($opt_default && (@CANDIDATE == 1) && $CANDIDATE[0][0]) { - $SSL_DIR = $CANDIDATE[0][0]; - print "Using --default OpenSSL candidate found at $SSL_DIR\n"; -@@ -51,9 +52,10 @@ if($opt_default && (@CANDIDATE == 1) && - unless($CANDIDATE[0][0]) { - print "No OpenSSL installation found, usually in $POSSIBLE_SSL_DIRS[0]\n"; - } -- $SSL_DIR = prompt "Which OpenSSL build path do you want to link against?", $CANDIDATE[0][0]; -+ $SSL_DIR = $CANDIDATE[0][0]; - } - } -+__SKIP__ - - my $candidate = &Candidate($SSL_DIR); - unless($candidate) { diff --git a/security/p5-Crypt-SSLeay/patches/patch-ab b/security/p5-Crypt-SSLeay/patches/patch-ab deleted file mode 100644 index 4514b7a3a24..00000000000 --- a/security/p5-Crypt-SSLeay/patches/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2006/10/28 15:14:59 schwarz Exp $ - ---- SSLeay.xs.orig 2003-05-28 08:55:02.000000000 +0200 -+++ SSLeay.xs 2006-10-28 14:25:40.000000000 +0200 -@@ -40,7 +40,7 @@ - */ - - --static void InfoCallback(SSL *s,int where,int ret) -+static void InfoCallback(const SSL *s,int where,int ret) - { - char *str; - int w; -@@ -107,7 +107,7 @@ - int rand_bytes_read; - - if(!bNotFirstTime) { -- SSLeay_add_all_algorithms(); -+ SSL_library_init(); - SSL_load_error_strings(); - ERR_load_crypto_strings(); - bNotFirstTime = 1; -@@ -130,6 +130,8 @@ - /* v2 is the default */ - ctx = SSL_CTX_new(SSLv2_client_method()); - } -+ if (ctx == 0) -+ croak("SSL_CTX_new failed"); - SSL_CTX_set_options(ctx,SSL_OP_ALL|0); - - SSL_CTX_set_default_verify_paths(ctx); |