CVS commit: pkgsrc/security/openssh

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Jan 19 03:50:53 UTC 2017

Modified Files:
        pkgsrc/security/openssh: Makefile PLIST
Removed Files:
        pkgsrc/security/openssh: MESSAGE.urandom

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


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/security/openssh/MESSAGE.urandom
cvs rdiff -u -r1.250 -r1.251 pkgsrc/security/openssh/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/security/openssh/PLIST

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

Modified files:

Index: pkgsrc/security/openssh/Makefile
diff -u pkgsrc/security/openssh/Makefile:1.250 pkgsrc/security/openssh/Makefile:1.251
--- pkgsrc/security/openssh/Makefile:1.250      Fri Dec 30 04:43:16 2016
+++ pkgsrc/security/openssh/Makefile    Thu Jan 19 03:50:53 2017
@@ -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 @@ CONFIGURE_ARGS+=   --with-xauth=${PREFIX}/
 
 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}
 

Index: pkgsrc/security/openssh/PLIST
diff -u pkgsrc/security/openssh/PLIST:1.18 pkgsrc/security/openssh/PLIST:1.19
--- pkgsrc/security/openssh/PLIST:1.18  Tue Mar 15 20:54:07 2016
+++ pkgsrc/security/openssh/PLIST       Thu Jan 19 03:50:53 2017
@@ -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 @@ bin/ssh-keyscan
 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 @@ sbin/sshd
 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