[pkgsrc/trunk]: pkgsrc/security/openssh GC deprecated logic for openssh witho...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1f3559334dc9
branches:  trunk
changeset: 357352:1f3559334dc9
user:      maya <maya%pkgsrc.org@localhost>
date:      Thu Jan 19 03:50:53 2017 +0000

description:
GC deprecated logic for openssh without /dev/urandom. This option is no longer
supported by OpenSSH.

diffstat:

 security/openssh/MESSAGE.urandom |   8 --------
 security/openssh/Makefile        |  14 ++------------
 security/openssh/PLIST           |   4 +---
 3 files changed, 3 insertions(+), 23 deletions(-)

diffs (64 lines):

diff -r 1bd8f2056110 -r 1f3559334dc9 security/openssh/MESSAGE.urandom
--- a/security/openssh/MESSAGE.urandom  Thu Jan 19 02:33:03 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.urandom,v 1.1 2002/02/05 04:17:31 jlam Exp $
-
-You will need a working /dev/urandom.  Please make sure you have a kernel
-compiled from a config file containing the line:
-
-       pseudo-device   rnd
-===========================================================================
diff -r 1bd8f2056110 -r 1f3559334dc9 security/openssh/Makefile
--- a/security/openssh/Makefile Thu Jan 19 02:33:03 2017 +0000
+++ b/security/openssh/Makefile Thu Jan 19 03:50:53 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.250 2016/12/30 04:43:16 taca Exp $
+# $NetBSD: Makefile,v 1.251 2017/01/19 03:50:53 maya Exp $
 
 DISTNAME=              openssh-7.4p1
 PKGNAME=               ${DISTNAME:S/p1/.1/}
@@ -143,17 +143,7 @@
 
 CONFS=                 ssh_config sshd_config moduli
 
-PLIST_VARS+=           darwin prng
-
-.if exists(/dev/urandom)
-.  if ${OPSYS} == "NetBSD"
-MESSAGE_SRC+=          ${.CURDIR}/MESSAGE.urandom
-.  endif
-.else
-CONFIGURE_ARGS+=       --without-random
-CONFS+=                        ssh_prng_cmds
-PLIST.prng=            yes
-.endif
+PLIST_VARS+=           darwin
 
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 
diff -r 1bd8f2056110 -r 1f3559334dc9 security/openssh/PLIST
--- a/security/openssh/PLIST    Thu Jan 19 02:33:03 2017 +0000
+++ b/security/openssh/PLIST    Thu Jan 19 03:50:53 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2016/03/15 20:54:07 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.19 2017/01/19 03:50:53 maya Exp $
 bin/scp
 bin/sftp
 bin/ssh
@@ -9,7 +9,6 @@
 libexec/sftp-server
 libexec/ssh-keysign
 libexec/ssh-pkcs11-helper
-${PLIST.prng}libexec/ssh-rand-helper
 man/man1/scp.1
 man/man1/sftp.1
 man/man1/ssh-add.1
@@ -28,6 +27,5 @@
 share/examples/openssh/moduli
 ${PLIST.darwin}share/examples/openssh/org.openssh.sshd.sb
 share/examples/openssh/ssh_config
-${PLIST.prng}share/examples/openssh/ssh_prng_cmds
 ${PLIST.pam}share/examples/openssh/sshd.pam
 share/examples/openssh/sshd_config