diff options
| author | sevan <sevan@pkgsrc.org> | 2015-11-11 11:40:06 +0000 |
|---|---|---|
| committer | sevan <sevan@pkgsrc.org> | 2015-11-11 11:40:06 +0000 |
| commit | 8e60e371374a148cb8bca9daaf9e6c055a4541f4 (patch) | |
| tree | 93866d216addea10f5b4d6c4f1d43b2ffcab7dba /security | |
| parent | 2c03b545656ec944f94c164613d1ed9c838af70f (diff) | |
| download | pkgsrc-8e60e371374a148cb8bca9daaf9e6c055a4541f4.tar.gz | |
Remove the check for the presence of ssh_host_key & the command to generate it,
if ssh_host_key doesn't exist.
RSA1 support is dead and doesn't exist in the package we generate, hence,
regeneration of the key is executed everytime sshd is started/restarted.
Bump PKGREVISION
Reviewed by wiz@
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/Makefile | 3 | ||||
| -rw-r--r-- | security/openssh/files/sshd.sh | 12 |
2 files changed, 4 insertions, 11 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 17f816556e9..f9e5e282fbb 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.237 2015/09/03 21:05:24 sevan Exp $ +# $NetBSD: Makefile,v 1.238 2015/11/11 11:40:06 sevan Exp $ DISTNAME= openssh-7.1p1 PKGNAME= ${DISTNAME:S/p1/.1/} +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_OPENBSD:=OpenSSH/portable/} diff --git a/security/openssh/files/sshd.sh b/security/openssh/files/sshd.sh index 039d304402c..8493e047e43 100644 --- a/security/openssh/files/sshd.sh +++ b/security/openssh/files/sshd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: sshd.sh,v 1.15 2015/01/17 01:11:06 gdt Exp $ +# $NetBSD: sshd.sh,v 1.16 2015/11/11 11:40:06 sevan Exp $ # # PROVIDE: sshd # REQUIRE: DAEMON LOGIN @@ -22,13 +22,6 @@ sshd_keygen() { ( umask 022 - if [ -f @PKG_SYSCONFDIR@/ssh_host_key ]; then - @ECHO@ "You already have an RSA host key in @PKG_SYSCONFDIR@/ssh_host_key" - @ECHO@ "Skipping protocol version 1 RSA Key Generation" - else - ${keygen_command} -t rsa1 -b 1024 -f @PKG_SYSCONFDIR@/ssh_host_key -N '' - fi - if [ -f @PKG_SYSCONFDIR@/ssh_host_dsa_key ]; then @ECHO@ "You already have a DSA host key in @PKG_SYSCONFDIR@/ssh_host_dsa_key" @ECHO@ "Skipping protocol version 2 DSA Key Generation" @@ -63,8 +56,7 @@ sshd_keygen() sshd_precmd() { - if [ ! -f @PKG_SYSCONFDIR@/ssh_host_key -o \ - ! -f @PKG_SYSCONFDIR@/ssh_host_dsa_key -o \ + if [ ! -f @PKG_SYSCONFDIR@/ssh_host_dsa_key -o \ ! -f @PKG_SYSCONFDIR@/ssh_host_rsa_key -o \ ! -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key -o \ ! -f @PKG_SYSCONFDIR@/ssh_host_ed25519_key ]; then |