diff options
| author | maya <maya@pkgsrc.org> | 2017-01-19 03:50:53 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2017-01-19 03:50:53 +0000 |
| commit | 3540bc00c231b0ab2a4bb8d7356d4f072a656f40 (patch) | |
| tree | 7f51855607db8a2e4bb9f95af4c117693f1b416a | |
| parent | 3c70629635b40a587b528c474f791284fddf4b01 (diff) | |
| download | pkgsrc-3540bc00c231b0ab2a4bb8d7356d4f072a656f40.tar.gz | |
GC deprecated logic for openssh without /dev/urandom. This option is no longer
supported by OpenSSH.
| -rw-r--r-- | security/openssh/MESSAGE.urandom | 8 | ||||
| -rw-r--r-- | security/openssh/Makefile | 14 | ||||
| -rw-r--r-- | security/openssh/PLIST | 4 |
3 files changed, 3 insertions, 23 deletions
diff --git a/security/openssh/MESSAGE.urandom b/security/openssh/MESSAGE.urandom deleted file mode 100644 index 52641980c96..00000000000 --- a/security/openssh/MESSAGE.urandom +++ /dev/null @@ -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 --git a/security/openssh/Makefile b/security/openssh/Makefile index 01e1a66e5f8..89688bfd712 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -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}/bin/xauth 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 --git a/security/openssh/PLIST b/security/openssh/PLIST index e18d93a97c3..1c18b8b3e9c 100644 --- a/security/openssh/PLIST +++ b/security/openssh/PLIST @@ -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 |