openssh: upgrade 10.1p1 -> 10.2p1

Drop patch merged[1] in this release.

Changelog:
https://www.openssh.org/releasenotes.html#10.2p1

[1] https://github.com/openssh/openssh-portable/commit/11a5e5179077f73c2d45bcdf3f60153ae3f17815

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>

diff --git a/meta/recipes-connectivity/openssh/openssh/0001-regress-test-exec-use-the-absolute-path-in-the-SSH-e.patch b/meta/recipes-connectivity/openssh/openssh/0001-regress-test-exec-use-the-absolute-path-in-the-SSH-e.patch
deleted file mode 100644 (file)
index 360b62a..0000000
--- a/meta/recipes-connectivity/openssh/openssh/0001-regress-test-exec-use-the-absolute-path-in-the-SSH-e.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9dcccafe44ea17e972e7cddea205bbe9fe71d8d6 Mon Sep 17 00:00:00 2001
-From: Jose Quaresma <jose.quaresma@foundries.io>
-Date: Mon, 15 Jul 2024 18:43:08 +0100
-Subject: [PATCH] regress/test-exec: use the absolute path in the SSH env
-
-The SSHAGENT_BIN was changed in [1] to SSH_BIN but
-the last one don't use the absolute path and consequently
-the function increase_datafile_size can loops forever
-if the binary not found.
-
-[1] https://github.com/openssh/openssh-portable/commit/a68f80f2511f0e0c5cef737a8284cc2dfabad818
-
-Upstream-Status: Submitted [https://github.com/openssh/openssh-portable/pull/510]
-
-Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
----
- regress/test-exec.sh | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/regress/test-exec.sh b/regress/test-exec.sh
-index 8a00c72..2891f27 100644
---- a/regress/test-exec.sh
-+++ b/regress/test-exec.sh
-@@ -179,6 +179,11 @@ if [ "x$TEST_SSH_OPENSSL" != "x" ]; then
- fi
- 
- # Path to sshd must be absolute for rexec
-+case "$SSH" in
-+/*) ;;
-+*) SSH=`which $SSH` ;;
-+esac
-+
- case "$SSHD" in
- /*) ;;
- *) SSHD=`which $SSHD` ;;

diff --git a/meta/recipes-connectivity/openssh/openssh_10.1p1.bb b/meta/recipes-connectivity/openssh/openssh_10.2p1.bb
similarity index 98%
rename from meta/recipes-connectivity/openssh/openssh_10.1p1.bb
rename to meta/recipes-connectivity/openssh/openssh_10.2p1.bb
index 83b6183858c9b9588640f36e10d1fc6b2f5cde2a..866129573f58e73f7fdd9506feca3beb1d928912 100644 (file)
--- a/meta/recipes-connectivity/openssh/openssh_10.1p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_10.2p1.bb
@@ -24,9 +24,8 @@ SRC_URI = "https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.ta
            file://run-ptest \
            file://sshd_check_keys \
            file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \
-           file://0001-regress-test-exec-use-the-absolute-path-in-the-SSH-e.patch \
            "
-SRC_URI[sha256sum] = "b9fc7a2b82579467a6f2f43e4a81c8e1dfda614ddb4f9b255aafd7020bbf0758"
+SRC_URI[sha256sum] = "ccc42c0419937959263fa1dbd16dafc18c56b984c03562d2937ce56a60f798b2"
 
 CVE_STATUS[CVE-2007-2768] = "not-applicable-config: This CVE is specific to OpenSSH with the pam opie which we don't build/use here."