diff --git a/openssh/build.sh b/openssh/build.sh index 0f12a8a..0b0c2e4 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=9.6p1 +version=9.7p1 pkgver=1 source[0]=https://cdn.openbsd.org/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 c4c9c32..08d3b18 100644 --- a/openssh/meta/ChangeLog +++ b/openssh/meta/ChangeLog @@ -1,5 +1,8 @@ CHANGELOG -------- +* Tue Mar 12 2024 Tom G. Christensen - 9.7p1-1 +- Update to 9.7p1 + * Tue Dec 19 2023 Tom G. Christensen - 9.6p1-1 - Update to 9.6p1 diff --git a/openssh/src/0001-regress-login-timeout.sh-increase-timeouts.patch b/openssh/src/0001-regress-login-timeout.sh-increase-timeouts.patch index 8439683..584fbcb 100644 --- a/openssh/src/0001-regress-login-timeout.sh-increase-timeouts.patch +++ b/openssh/src/0001-regress-login-timeout.sh-increase-timeouts.patch @@ -17,13 +17,13 @@ index 1577da159..33857e1d9 100644 cp $OBJ/sshd_config $OBJ/sshd_config.orig grep -vi LoginGraceTime $OBJ/sshd_config.orig > $OBJ/sshd_config -echo "LoginGraceTime 10s" >> $OBJ/sshd_config -+echo "LoginGraceTime 35s" >> $OBJ/sshd_config ++echo "LoginGraceTime 45s" >> $OBJ/sshd_config echo "MaxStartups 1" >> $OBJ/sshd_config start_sshd (echo SSH-2.0-fake; sleep 60) | telnet 127.0.0.1 ${PORT} >/dev/null 2>&1 & -sleep 15 -+sleep 40 ++sleep 50 ${SSH} -F $OBJ/ssh_config somehost true if [ $? -ne 0 ]; then fail "ssh connect after login grace timeout failed"