CVS commit: pkgsrc/security/p5-Net-SSH

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Wed Aug 23 14:52:53 UTC 2017

Modified Files:
        pkgsrc/security/p5-Net-SSH: Makefile distinfo
Added Files:
        pkgsrc/security/p5-Net-SSH/patches: patch-lib_Net_SSH_Perl_Kex.pm

Log Message:
Update dependency list according to Makefile.pl, in particular
add dependency on the recently added p5-Crypt-Curve25519 package.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/security/p5-Net-SSH/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/p5-Net-SSH/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/p5-Net-SSH/patches/patch-lib_Net_SSH_Perl_Kex.pm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/p5-Net-SSH/Makefile
diff -u pkgsrc/security/p5-Net-SSH/Makefile:1.23 pkgsrc/security/p5-Net-SSH/Makefile:1.24
--- pkgsrc/security/p5-Net-SSH/Makefile:1.23    Mon Jun  5 14:24:34 2017
+++ pkgsrc/security/p5-Net-SSH/Makefile Wed Aug 23 14:52:53 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2017/06/05 14:24:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.24 2017/08/23 14:52:53 he Exp $
 #
 
 DISTNAME=              Net-SSH-Perl-2.09.01
 PKGNAME=               p5-${DISTNAME:C/-Perl//}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            security net perl5
 MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=Net/}
 
@@ -13,10 +13,12 @@ COMMENT=            Perl implementations of SSH1 a
 LICENSE=               ${PERL5_LICENSE}
 
 DEPENDS+=              p5-Convert-PEM>=0.05:../../textproc/p5-Convert-PEM
-DEPENDS+=              p5-CryptX-[0-9]*:../../security/p5-CryptX
+DEPENDS+=              p5-CryptX>=0.032:../../security/p5-CryptX
 DEPENDS+=              p5-Digest-BubbleBabble>=0.01:../../security/p5-Digest-BubbleBabble
 DEPENDS+=              p5-Math-GMP>=1.04:../../math/p5-Math-GMP
 DEPENDS+=              p5-String-CRC32>=1.2:../../textproc/p5-String-CRC32
+DEPENDS+=              p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
+DEPENDS+=              p5-Crypt-Curve25519>=0.05:../../security/p5-Crypt-Curve25519
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.p5-Net-SSH
 PKG_SUPPORTED_OPTIONS= idea

Index: pkgsrc/security/p5-Net-SSH/distinfo
diff -u pkgsrc/security/p5-Net-SSH/distinfo:1.7 pkgsrc/security/p5-Net-SSH/distinfo:1.8
--- pkgsrc/security/p5-Net-SSH/distinfo:1.7     Fri Apr  7 00:41:59 2017
+++ pkgsrc/security/p5-Net-SSH/distinfo Wed Aug 23 14:52:53 2017
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2017/04/07 00:41:59 mef Exp $
+$NetBSD: distinfo,v 1.8 2017/08/23 14:52:53 he Exp $
 
 SHA1 (Net-SSH-Perl-2.09.01.tar.gz) = 926cbdbb30aa85b7503698763455ad6926c471ee
 RMD160 (Net-SSH-Perl-2.09.01.tar.gz) = 235dab415b1e094f4b13313d5fe0e6ed359c8c39
 SHA512 (Net-SSH-Perl-2.09.01.tar.gz) = e7d7194e175490ba0849357ebbb504932d97b358722f2045e0acbaba9c14dc945629bd5653b36934317632e0d3894525e4f34ea48b494f2cc815959106138b44
 Size (Net-SSH-Perl-2.09.01.tar.gz) = 255286 bytes
 SHA1 (patch-aa) = d85b70f5f4d4ccb55aabef6671171bf64c6fcdb9
+SHA1 (patch-lib_Net_SSH_Perl_Kex.pm) = ebd933b7ee9510a8182083da97ef38433ee61102

Added files:

Index: pkgsrc/security/p5-Net-SSH/patches/patch-lib_Net_SSH_Perl_Kex.pm
diff -u /dev/null pkgsrc/security/p5-Net-SSH/patches/patch-lib_Net_SSH_Perl_Kex.pm:1.1
--- /dev/null   Wed Aug 23 14:52:53 2017
+++ pkgsrc/security/p5-Net-SSH/patches/patch-lib_Net_SSH_Perl_Kex.pm    Wed Aug 23 14:52:53 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_Net_SSH_Perl_Kex.pm,v 1.1 2017/08/23 14:52:53 he Exp $
+
+At least output a debug message if use of the key exchange algo fails.
+
+--- lib/Net/SSH/Perl/Kex.pm.orig       2017-03-15 10:12:27.000000000 +0000
++++ lib/Net/SSH/Perl/Kex.pm
+@@ -232,6 +232,9 @@ sub choose_kex {
+     if (my $pkg = $kexmap{$name}) {
+         $kex->{ssh}->debug("Using $name for key exchange");
+         eval "use Net::SSH::Perl::Kex::$pkg";
++      if ($@) {
++          $kex->{ssh}->debug("Problem doing use Net::SSH::Perl::Kex::$pkg: $@");
++      }
+         $kex->{class_name} = __PACKAGE__ . '::' . $pkg;
+     } else {
+         croak "Bad kex algorithm $name";