diff --git a/openssh/build.sh b/openssh/build.sh index b887d8d..a92d5c9 100755 --- a/openssh/build.sh +++ b/openssh/build.sh @@ -6,7 +6,7 @@ ########################################################### # Check the following 4 variables before running the script topdir=openssh -version=7.7p1 +version=7.8p1 pkgver=1 source[0]=ftp://ftp.heanet.ie/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz # If there are no patches, simply comment this diff --git a/openssh/meta/ChangeLog b/openssh/meta/ChangeLog index 09a5b74..5422b3f 100644 --- a/openssh/meta/ChangeLog +++ b/openssh/meta/ChangeLog @@ -1,5 +1,9 @@ CHANGELOG --------- +* Fri Aug 24 2018 Tom G. Christensen - 7.8p1-1 +- Update to 7.8p1 +- Drop creation of DSA keys in the init script + * Wed Apr 04 2018 Tom G. Christensen - 7.7p1-1 - Update to 7.7p1 diff --git a/openssh/src/sshd.init b/openssh/src/sshd.init index 8c53943..927895f 100755 --- a/openssh/src/sshd.init +++ b/openssh/src/sshd.init @@ -6,7 +6,6 @@ SSHD=/usr/tgcware/sbin/sshd KEYGEN=/usr/tgcware/bin/ssh-keygen RSA_KEY=/usr/tgcware/etc/ssh/ssh_host_rsa_key -DSA_KEY=/usr/tgcware/etc/ssh/ssh_host_dsa_key ECDSA_KEY=/usr/tgcware/etc/ssh/ssh_host_ecdsa_key ED25519_KEY=/usr/tgcware/etc/ssh/ssh_host_ed25519_key ECHO=/usr/bin/echo @@ -29,11 +28,6 @@ do_hostkeygen() $KEYGEN -q -t rsa -f $RSA_KEY -N '' > /dev/null 2>&1 $ECHO "." fi - if [ ! -s $DSA_KEY ]; then - $ECHO "Generating $DSA_KEY:\c" - $KEYGEN -q -t dsa -f $DSA_KEY -N '' > /dev/null 2>&1 - $ECHO "." - fi if [ ! -s $ECDSA_KEY ]; then $ECHO "Generating $ECDSA_KEY:\c" $KEYGEN -q -t ecdsa -f $ECDSA_KEY -N '' > /dev/null 2>&1 @@ -72,7 +66,7 @@ case $mode in $ECHO "." fi ;; - stop) + stop) kill_sshd exit 0 ;; @@ -82,7 +76,7 @@ case $mode in *) echo "Usage: $0 {start|stop|restart}" ;; -esac +esac else echo "$0: this script must be run as root... fatal error"