openssh: update to 9.7p1

This commit is contained in:
Tom G. Christensen 2024-03-14 17:32:26 +01:00
parent 0997de3335
commit 4df3515356
3 changed files with 6 additions and 3 deletions

View File

@ -6,7 +6,7 @@
########################################################### ###########################################################
# Check the following 4 variables before running the script # Check the following 4 variables before running the script
topdir=openssh topdir=openssh
version=9.6p1 version=9.7p1
pkgver=1 pkgver=1
source[0]=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz source[0]=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz
# If there are no patches, simply comment this # If there are no patches, simply comment this

View File

@ -1,5 +1,8 @@
CHANGELOG CHANGELOG
-------- --------
* Tue Mar 12 2024 Tom G. Christensen <swpkg@jupiterrise.com> - 9.7p1-1
- Update to 9.7p1
* Tue Dec 19 2023 Tom G. Christensen <swpkg@jupiterrise.com> - 9.6p1-1 * Tue Dec 19 2023 Tom G. Christensen <swpkg@jupiterrise.com> - 9.6p1-1
- Update to 9.6p1 - Update to 9.6p1

View File

@ -17,13 +17,13 @@ index 1577da159..33857e1d9 100644
cp $OBJ/sshd_config $OBJ/sshd_config.orig cp $OBJ/sshd_config $OBJ/sshd_config.orig
grep -vi LoginGraceTime $OBJ/sshd_config.orig > $OBJ/sshd_config grep -vi LoginGraceTime $OBJ/sshd_config.orig > $OBJ/sshd_config
-echo "LoginGraceTime 10s" >> $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 echo "MaxStartups 1" >> $OBJ/sshd_config
start_sshd start_sshd
(echo SSH-2.0-fake; sleep 60) | telnet 127.0.0.1 ${PORT} >/dev/null 2>&1 & (echo SSH-2.0-fake; sleep 60) | telnet 127.0.0.1 ${PORT} >/dev/null 2>&1 &
-sleep 15 -sleep 15
+sleep 40 +sleep 50
${SSH} -F $OBJ/ssh_config somehost true ${SSH} -F $OBJ/ssh_config somehost true
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
fail "ssh connect after login grace timeout failed" fail "ssh connect after login grace timeout failed"