Thu May 22 03:14:01 2014 UTC ()
Update patch to stop error message with rc.d script.
It was noted by Ken'ichi Fukamachi via PR pkg/48825.

Bump PKGREVISION.


(taca)
diff -r1.218 -r1.219 pkgsrc/security/openssh/Makefile
diff -r1.13 -r1.14 pkgsrc/security/openssh/files/sshd.sh
cvs diff -r1.218 -r1.219 pkgsrc/security/openssh/Makefile (expand / switch to unified diff)

--- pkgsrc/security/openssh/Makefile 2014/03/29 09:38:11 1.218
+++ pkgsrc/security/openssh/Makefile 2014/05/22 03:14:01 1.219
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.218 2014/03/29 09:38:11 taca Exp $ 1# $NetBSD: Makefile,v 1.219 2014/05/22 03:14:01 taca Exp $
2 2
3DISTNAME= openssh-6.6p1 3DISTNAME= openssh-6.6p1
4PKGNAME= openssh-6.6.1 4PKGNAME= openssh-6.6.1
 5PKGREVISION= 1
5SVR4_PKGNAME= ossh 6SVR4_PKGNAME= ossh
6CATEGORIES= security 7CATEGORIES= security
7MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \ 8MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
8 ftp://ftp3.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ 9 ftp://ftp3.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
9 ftp://gd.tuwien.ac.at/opsys/OpenBSD/OpenSSH/portable/ \ 10 ftp://gd.tuwien.ac.at/opsys/OpenBSD/OpenSSH/portable/ \
10 ftp://ftp.freenet.de/pub/ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ 11 ftp://ftp.freenet.de/pub/ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
11 ftp://ftp.jaist.ac.jp/pub/OpenBSD/OpenSSH/portable/ \ 12 ftp://ftp.jaist.ac.jp/pub/OpenBSD/OpenSSH/portable/ \
12 ftp://ftp.belnet.be/packages/openbsd/OpenSSH/portable/ 13 ftp://ftp.belnet.be/packages/openbsd/OpenSSH/portable/
13# Don't delete the last entry -- it's there if the pkgsrc version is not 14# Don't delete the last entry -- it's there if the pkgsrc version is not
14# up-to-date and the mirrors already removed the old distfile. 15# up-to-date and the mirrors already removed the old distfile.
15 16
16MAINTAINER= pkgsrc-users@NetBSD.org 17MAINTAINER= pkgsrc-users@NetBSD.org
17HOMEPAGE= http://www.openssh.com/ 18HOMEPAGE= http://www.openssh.com/
cvs diff -r1.13 -r1.14 pkgsrc/security/openssh/files/sshd.sh (expand / switch to unified diff)

--- pkgsrc/security/openssh/files/sshd.sh 2011/05/17 03:26:52 1.13
+++ pkgsrc/security/openssh/files/sshd.sh 2014/05/22 03:14:01 1.14
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: sshd.sh,v 1.13 2011/05/17 03:26:52 taca Exp $ 3# $NetBSD: sshd.sh,v 1.14 2014/05/22 03:14:01 taca Exp $
4# 4#
5# PROVIDE: sshd 5# PROVIDE: sshd
6# REQUIRE: DAEMON LOGIN 6# REQUIRE: DAEMON LOGIN
7 7
8if [ -f /etc/rc.subr ] 8if [ -f /etc/rc.subr ]
9then 9then
10 . /etc/rc.subr 10 . /etc/rc.subr
11fi 11fi
12 12
13name="sshd" 13name="sshd"
14rcvar=$name 14rcvar=$name
15command="@PREFIX@/sbin/${name}" 15command="@PREFIX@/sbin/${name}"
16keygen_command="@PREFIX@/bin/ssh-keygen" 16keygen_command="@PREFIX@/bin/ssh-keygen"
@@ -40,35 +40,44 @@ sshd_keygen() @@ -40,35 +40,44 @@ sshd_keygen()
40 @ECHO@ "You already have a RSA host key in @PKG_SYSCONFDIR@/ssh_host_rsa_key" 40 @ECHO@ "You already have a RSA host key in @PKG_SYSCONFDIR@/ssh_host_rsa_key"
41 @ECHO@ "Skipping protocol version 2 RSA Key Generation" 41 @ECHO@ "Skipping protocol version 2 RSA Key Generation"
42 else 42 else
43 ${keygen_command} -t rsa -f @PKG_SYSCONFDIR@/ssh_host_rsa_key -N '' 43 ${keygen_command} -t rsa -f @PKG_SYSCONFDIR@/ssh_host_rsa_key -N ''
44 fi 44 fi
45/* HAVE_ECDSA_START */ 45/* HAVE_ECDSA_START */
46 if [ -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key ]; then 46 if [ -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key ]; then
47 @ECHO@ "You already have a ECDSA host key in @PKG_SYSCONFDIR@/ssh_host_ecdsa_key" 47 @ECHO@ "You already have a ECDSA host key in @PKG_SYSCONFDIR@/ssh_host_ecdsa_key"
48 @ECHO@ "Skipping protocol version 2 ECDSA Key Generation" 48 @ECHO@ "Skipping protocol version 2 ECDSA Key Generation"
49 else 49 else
50 ${keygen_command} -t ecdsa -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key -N '' 50 ${keygen_command} -t ecdsa -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key -N ''
51 fi 51 fi
52/* HAVE_ECDSA_STOP */ 52/* HAVE_ECDSA_STOP */
 53/* HAVE_ED25519_START */
 54 if [ -f @PKG_SYSCONFDIR@/ssh_host_ed25519_key ]; then
 55 @ECHO@ "You already have a ED25519 host key in @PKG_SYSCONFDIR@/ssh_host_ed25519_key"
 56 @ECHO@ "Skipping protocol version 2 ED25519 Key Generation"
 57 else
 58 ${keygen_command} -t ed25519 -f @PKG_SYSCONFDIR@/ssh_host_ed25519_key -N ''
 59 fi
 60/* HAVE_ED25519_STOP */
53 ) 61 )
54} 62}
55 63
56sshd_precmd() 64sshd_precmd()
57{ 65{
58 if [ ! -f @PKG_SYSCONFDIR@/ssh_host_key -o \ 66 if [ ! -f @PKG_SYSCONFDIR@/ssh_host_key -o \
59 ! -f @PKG_SYSCONFDIR@/ssh_host_dsa_key -o \ 67 ! -f @PKG_SYSCONFDIR@/ssh_host_dsa_key -o \
60 ! -f @PKG_SYSCONFDIR@/ssh_host_rsa_key -o \ 68 ! -f @PKG_SYSCONFDIR@/ssh_host_rsa_key -o \
61 ! -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key ]; then 69 ! -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key -o \
 70 ! -f @PKG_SYSCONFDIR@/ssh_host_ed25519_key ]; then
62 if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -f /etc/rc.d/DAEMON ] 71 if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -f /etc/rc.d/DAEMON ]
63 then 72 then
64 run_rc_command keygen 73 run_rc_command keygen
65 else 74 else
66 eval ${keygen_cmd} 75 eval ${keygen_cmd}
67 fi 76 fi
68 fi 77 fi
69} 78}
70 79
71keygen_cmd=sshd_keygen 80keygen_cmd=sshd_keygen
72start_precmd=sshd_precmd 81start_precmd=sshd_precmd
73 82
74if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -f /etc/rc.d/DAEMON ] 83if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -f /etc/rc.d/DAEMON ]