diff options
| author | taca <taca> | 2014-05-22 03:14:01 +0000 |
|---|---|---|
| committer | taca <taca> | 2014-05-22 03:14:01 +0000 |
| commit | eb6fda1a1e563bd6eb56540e2a453b3d4ee48343 (patch) | |
| tree | 03fd4956175b0766c9b746148087d64a71bc87c5 /security/openssh | |
| parent | e34602a6d05b8deeeea20961c215a3df99e5c538 (diff) | |
| download | pkgsrc-eb6fda1a1e563bd6eb56540e2a453b3d4ee48343.tar.gz | |
Update patch to stop error message with rc.d script.
It was noted by Ken'ichi Fukamachi via PR pkg/48825.
Bump PKGREVISION.
Diffstat (limited to 'security/openssh')
| -rw-r--r-- | security/openssh/Makefile | 3 | ||||
| -rw-r--r-- | security/openssh/files/sshd.sh | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 36bcbc06a84..51f41b0daca 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.218 2014/03/29 09:38:11 taca Exp $ +# $NetBSD: Makefile,v 1.219 2014/05/22 03:14:01 taca Exp $ DISTNAME= openssh-6.6p1 PKGNAME= openssh-6.6.1 +PKGREVISION= 1 SVR4_PKGNAME= ossh CATEGORIES= security MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \ diff --git a/security/openssh/files/sshd.sh b/security/openssh/files/sshd.sh index 26bc4f65ee1..25ee71563b2 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.13 2011/05/17 03:26:52 taca Exp $ +# $NetBSD: sshd.sh,v 1.14 2014/05/22 03:14:01 taca Exp $ # # PROVIDE: sshd # REQUIRE: DAEMON LOGIN @@ -50,6 +50,14 @@ sshd_keygen() ${keygen_command} -t ecdsa -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key -N '' fi /* HAVE_ECDSA_STOP */ +/* HAVE_ED25519_START */ + if [ -f @PKG_SYSCONFDIR@/ssh_host_ed25519_key ]; then + @ECHO@ "You already have a ED25519 host key in @PKG_SYSCONFDIR@/ssh_host_ed25519_key" + @ECHO@ "Skipping protocol version 2 ED25519 Key Generation" + else + ${keygen_command} -t ed25519 -f @PKG_SYSCONFDIR@/ssh_host_ed25519_key -N '' + fi +/* HAVE_ED25519_STOP */ ) } @@ -58,7 +66,8 @@ sshd_precmd() if [ ! -f @PKG_SYSCONFDIR@/ssh_host_key -o \ ! -f @PKG_SYSCONFDIR@/ssh_host_dsa_key -o \ ! -f @PKG_SYSCONFDIR@/ssh_host_rsa_key -o \ - ! -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key ]; then + ! -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key -o \ + ! -f @PKG_SYSCONFDIR@/ssh_host_ed25519_key ]; then if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -f /etc/rc.d/DAEMON ] then run_rc_command keygen |