openssh: update to 9.3p2

openssh/build.sh

@@ -6,12 +6,12 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=openssh
-version=9.1p1
+version=9.3p2
 pkgver=1
 source[0]=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz
 # If there are no patches, simply comment this
-patch[0]=0007-Fix-authopt-test-on-platforms-without-IPv6-support.patch
-patch[1]=0001-Workaround-missing-MAP_ANON.patch
+patch[0]=0001-regress-login-timeout.sh-increase-timeouts.patch
+patch[1]=0007-Fix-authopt-test-on-platforms-without-IPv6-support.patch
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions

openssh/meta/ChangeLog

@@ -1,5 +1,14 @@
 CHANGELOG
 --------
+* Fri Jul 21 2023 Tom G. Christensen <swpkg@jupiterrise.com> - 9.3p2-1
+- Update to 9.3p2
+
+* Tue Jun 27 2023 Tom G. Christensen <swpkg@jupiterrise.com> - 9.3p1-1
+- Update to 9.3p1
+
+* Thu Feb 02 2023 Tom G. Christensen <swpkg@jupiterrise.com> - 9.2p1-1
+- Update to 9.2p1
+
 * Wed Oct 05 2022 Tom G. Christensen <swpkg@jupiterrise.com> - 9.1p1-1
 - Update to 9.1p1
 

openssh/src/0001-Workaround-missing-MAP_ANON.patch

@@ -1,54 +0,0 @@
-From 2117a08838a57b2d042cc7df7010ff6a863613f6 Mon Sep 17 00:00:00 2001
-From: "Tom G. Christensen" <tgc@jupiterrise.com>
-Date: Sun, 16 Oct 2022 18:29:07 +0200
-Subject: [PATCH] Workaround missing MAP_ANON
-
-On Solaris MAP_ANON is only available from Solaris 8 and onward so a
-workaround is needed.
-This patch is based on https://stackoverflow.com/a/39945292
----
- openbsd-compat/arc4random.h | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/openbsd-compat/arc4random.h b/openbsd-compat/arc4random.h
-index 2b57611f..a7cbe1c4 100644
---- a/openbsd-compat/arc4random.h
-+++ b/openbsd-compat/arc4random.h
-@@ -63,6 +63,7 @@ _rs_forkdetect(void)
- static inline int
- _rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
- {
-+#ifdef MAP_ANON
- 	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
- 	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
- 		return (-1);
-@@ -73,6 +74,26 @@ _rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
- 		*rsp = NULL;
- 		return (-1);
- 	}
-+#else        /*Map /dev/zero*/
-+	int fd;
-+	fd = open("/dev/zero", O_RDWR);
-+	if (fd == -1)
-+	    return (-1);
-+
-+	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
-+			MAP_PRIVATE, fd, 0)) == MAP_FAILED)
-+	    return (-1);
-+
-+	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
-+			MAP_PRIVATE, fd, 0)) == MAP_FAILED) {
-+	    munmap(*rsp, sizeof(**rsp));
-+	    *rsp = NULL;
-+	    return (-1);
-+	}
-+
-+	if (close(fd) == -1)           /*No longer needed*/
-+	    return (-1);
-+#endif
- 
- 	_ARC4_ATFORK(_rs_forkhandler);
- 	return (0);
--- 
-2.36.1
-

openssh/src/0001-regress-login-timeout.sh-increase-timeouts.patch

@@ -0,0 +1,32 @@
+From b2395fb730e06767df9cc3785f3252d8b10bafb6 Mon Sep 17 00:00:00 2001
+From: "Tom G. Christensen" <tgc@jupiterrise.com>
+Date: Tue, 11 Jul 2023 20:34:30 +0200
+Subject: [PATCH] regress/login-timeout.sh: increase timeouts
+
+To allow slower hosts to run this test.
+---
+ regress/login-timeout.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh
+index 1577da159..33857e1d9 100644
+--- a/regress/login-timeout.sh
++++ b/regress/login-timeout.sh
+@@ -6,12 +6,12 @@ tid="connect after login grace timeout"
+ trace "test login grace time"
+ 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 "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
+ ${SSH} -F $OBJ/ssh_config somehost true
+ if [ $? -ne 0 ]; then
+ 	fail "ssh connect after login grace timeout failed"
+-- 
+2.36.3
+