Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *openssh* to *9.7p1* has Succeeded.
Next steps:
- apply the patch: git am 0001-openssh-upgrade-9.6p1-9.7p1.patch
- check the changes to upstream patches and summarize them in the commit
message,
- compile an image that contains the package
- perform some basic sanity tests
- amend the patch and sign it off: git commit -s --reset-author --amend
- send it to the appropriate mailing list
Alternatively, if you believe the recipe should not be upgraded at this time,
you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
automatic upgrades would no longer be attempted.
Please review the attached files for further information and build/update
failures.
Any problem please file a bug at
https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler
Regards,
The Upgrade Helper
-- >8 --
>From db9c9962e5a6cf8fb57b209a7d560785eb90ceb1 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <[email protected]>
Date: Mon, 1 Apr 2024 06:03:28 +0000
Subject: [PATCH] openssh: upgrade 9.6p1 -> 9.7p1
---
...h-log-input-and-output-files-on-erro.patch | 7 +--
...tional-support-for-systemd-sd_notify.patch | 17 +++---
.../add-test-support-for-busybox.patch | 56 +++++++++++--------
...igned-overflow-in-pointer-arithmatic.patch | 5 +-
.../{openssh_9.6p1.bb => openssh_9.7p1.bb} | 2 +-
5 files changed, 43 insertions(+), 44 deletions(-)
rename meta/recipes-connectivity/openssh/{openssh_9.6p1.bb =>
openssh_9.7p1.bb} (99%)
diff --git
a/meta/recipes-connectivity/openssh/openssh/0001-regress-banner.sh-log-input-and-output-files-on-erro.patch
b/meta/recipes-connectivity/openssh/openssh/0001-regress-banner.sh-log-input-and-output-files-on-erro.patch
index 8763f30f4b..fc91c53dfa 100644
---
a/meta/recipes-connectivity/openssh/openssh/0001-regress-banner.sh-log-input-and-output-files-on-erro.patch
+++
b/meta/recipes-connectivity/openssh/openssh/0001-regress-banner.sh-log-input-and-output-files-on-erro.patch
@@ -1,4 +1,4 @@
-From f5a4dacc987ca548fc86577c2dba121c86da3c34 Mon Sep 17 00:00:00 2001
+From 9aeeb7854d26d67c2a635056089705696e16ce94 Mon Sep 17 00:00:00 2001
From: Mikko Rapeli <[email protected]>
Date: Mon, 11 Sep 2023 09:55:21 +0100
Subject: [PATCH] regress/banner.sh: log input and output files on error
@@ -42,7 +42,7 @@ Signed-off-by: Mikko Rapeli <[email protected]>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/regress/banner.sh b/regress/banner.sh
-index a84feb5a..de84957a 100644
+index a84feb5..de84957 100644
--- a/regress/banner.sh
+++ b/regress/banner.sh
@@ -32,7 +32,9 @@ for s in 0 10 100 1000 10000 100000 ; do
@@ -56,6 +56,3 @@ index a84feb5a..de84957a 100644
done
trace "test suppress banner (-q)"
---
-2.34.1
-
diff --git
a/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch
b/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch
index acda8f1ce9..7aa7d6aebe 100644
---
a/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch
+++
b/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch
@@ -1,4 +1,4 @@
-From be187435911cde6cc3cef6982a508261074f1e56 Mon Sep 17 00:00:00 2001
+From 40c268703317153cff34115ec2fd30afcbf231d1 Mon Sep 17 00:00:00 2001
From: Matt Jolly <[email protected]>
Date: Thu, 2 Feb 2023 21:05:40 +1100
Subject: [PATCH] systemd: Add optional support for systemd `sd_notify`
@@ -15,10 +15,10 @@ Signed-off-by: Xiangyu Chen <[email protected]>
2 files changed, 37 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 22fee70f..486c189f 100644
+index 82e8bb7..d1145d3 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -4835,6 +4835,29 @@ AC_SUBST([GSSLIBS])
+@@ -4870,6 +4870,29 @@ AC_SUBST([GSSLIBS])
AC_SUBST([K5LIBS])
AC_SUBST([CHANNELLIBS])
@@ -48,7 +48,7 @@ index 22fee70f..486c189f 100644
# Looking for programs, paths and files
PRIVSEP_PATH=/var/empty
-@@ -5634,6 +5657,7 @@ echo " libldns support: $LDNS_MSG"
+@@ -5688,6 +5711,7 @@ echo " libldns support: $LDNS_MSG"
echo " Solaris process contract support: $SPC_MSG"
echo " Solaris project support: $SP_MSG"
echo " Solaris privilege support: $SPP_MSG"
@@ -57,7 +57,7 @@ index 22fee70f..486c189f 100644
echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
echo " BSD Auth support: $BSD_AUTH_MSG"
diff --git a/sshd.c b/sshd.c
-index 6321936c..859d6a0b 100644
+index b4f2b97..6820a41 100644
--- a/sshd.c
+++ b/sshd.c
@@ -88,6 +88,10 @@
@@ -71,7 +71,7 @@ index 6321936c..859d6a0b 100644
#include "xmalloc.h"
#include "ssh.h"
#include "ssh2.h"
-@@ -310,6 +314,10 @@ static void
+@@ -308,6 +312,10 @@ static void
sighup_restart(void)
{
logit("Received SIGHUP; restarting.");
@@ -82,7 +82,7 @@ index 6321936c..859d6a0b 100644
if (options.pid_file != NULL)
unlink(options.pid_file);
platform_pre_restart();
-@@ -2086,6 +2094,11 @@ main(int ac, char **av)
+@@ -2093,6 +2101,11 @@ main(int ac, char **av)
}
}
@@ -94,6 +94,3 @@ index 6321936c..859d6a0b 100644
/* Accept a connection and return in a forked child */
server_accept_loop(&sock_in, &sock_out,
&newsock, config_s);
---
-2.25.1
-
diff --git
a/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
b/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
index b8402a4dee..3de93fd667 100644
---
a/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
+++
b/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
@@ -1,16 +1,24 @@
-Adjust test cases to work with busybox.
+From 824919898ef57ae711461ae1fc473cf96efd7c62 Mon Sep 17 00:00:00 2001
+From: "Maxin B. John" <[email protected]>
+Date: Thu, 24 Apr 2014 18:00:22 +0200
+Subject: [PATCH] Adjust test cases to work with busybox.
- Replace dd parameter "obs" with "bs".
- Replace "head -<num>" with "head -n <num>".
Signed-off-by: Maxin B. John <[email protected]>
Upstream-Status: Pending
+---
+ regress/cipher-speed.sh | 2 +-
+ regress/key-options.sh | 2 +-
+ regress/transfer.sh | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
-Index: openssh-7.6p1/regress/cipher-speed.sh
-===================================================================
---- openssh-7.6p1.orig/regress/cipher-speed.sh
-+++ openssh-7.6p1/regress/cipher-speed.sh
-@@ -17,7 +17,7 @@ for c in `${SSH} -Q cipher`; do n=0; for
+diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh
+index 1340bd1..8770757 100644
+--- a/regress/cipher-speed.sh
++++ b/regress/cipher-speed.sh
+@@ -27,7 +27,7 @@ for c in `${SSH} -Q cipher`; do n=0; for m in `${SSH} -Q
mac`; do
printf "%-60s" "$c/$m:"
( ${SSH} -o 'compression no' \
-F $OBJ/ssh_proxy -m $m -c $c somehost \
@@ -19,24 +27,11 @@ Index: openssh-7.6p1/regress/cipher-speed.sh
< ${DATA} ) 2>&1 | getbytes
if [ $? -ne 0 ]; then
-Index: openssh-7.6p1/regress/transfer.sh
-===================================================================
---- openssh-7.6p1.orig/regress/transfer.sh
-+++ openssh-7.6p1/regress/transfer.sh
-@@ -13,7 +13,7 @@ cmp ${DATA} ${COPY} || fail "corrupted
- for s in 10 100 1k 32k 64k 128k 256k; do
- trace "dd-size ${s}"
- rm -f ${COPY}
-- dd if=$DATA obs=${s} 2> /dev/null | \
-+ dd if=$DATA bs=${s} 2> /dev/null | \
- ${SSH} -q -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
- if [ $? -ne 0 ]; then
- fail "ssh cat $DATA failed"
-Index: openssh-7.6p1/regress/key-options.sh
-===================================================================
---- openssh-7.6p1.orig/regress/key-options.sh
-+++ openssh-7.6p1/regress/key-options.sh
-@@ -47,7 +47,7 @@ for f in 127.0.0.1 '127.0.0.0\/8'; do
+diff --git a/regress/key-options.sh b/regress/key-options.sh
+index 2f3d66e..7f8166d 100644
+--- a/regress/key-options.sh
++++ b/regress/key-options.sh
+@@ -90,7 +90,7 @@ for f in 127.0.0.1 '127.0.0.0\/8'; do
fi
sed 's/.*/from="'"$f"'" &/' $origkeys >$authkeys
@@ -45,3 +40,16 @@ Index: openssh-7.6p1/regress/key-options.sh
verbose "key option $from"
r=`${SSH} -q -F $OBJ/ssh_proxy somehost 'echo true'`
if [ "$r" = "true" ]; then
+diff --git a/regress/transfer.sh b/regress/transfer.sh
+index cf174a0..41cfdc7 100644
+--- a/regress/transfer.sh
++++ b/regress/transfer.sh
+@@ -13,7 +13,7 @@ cmp ${DATA} ${COPY} || fail "corrupted copy"
+ for s in 10 100 1k 32k 64k 128k 256k; do
+ trace "dd-size ${s}"
+ rm -f ${COPY}
+- dd if=$DATA obs=${s} 2> /dev/null | \
++ dd if=$DATA bs=${s} 2> /dev/null | \
+ ${SSH} -q -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
+ if [ $? -ne 0 ]; then
+ fail "ssh cat $DATA failed"
diff --git
a/meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch
b/meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch
index 20036da931..73ee2b3bbd 100644
---
a/meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch
+++
b/meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch
@@ -1,4 +1,4 @@
-From 3328e98bcbf2930cd7eea3e6c92ad5dcbdf4794f Mon Sep 17 00:00:00 2001
+From 84fde6297211945cb675745d3f704438140c60a0 Mon Sep 17 00:00:00 2001
From: Yuanjie Huang <[email protected]>
Date: Wed, 24 Aug 2016 03:15:43 +0000
Subject: [PATCH] Fix potential signed overflow in pointer arithmatic
@@ -106,6 +106,3 @@ index 7ad3573..7040f1f 100644
+ return (size_t)((uintptr_t)cp - (uintptr_t)str);
}
#endif
---
-2.17.1
-
diff --git a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
b/meta/recipes-connectivity/openssh/openssh_9.7p1.bb
similarity index 99%
rename from meta/recipes-connectivity/openssh/openssh_9.6p1.bb
rename to meta/recipes-connectivity/openssh/openssh_9.7p1.bb
index edd8e8c2d1..3b0b47097c 100644
--- a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_9.7p1.bb
@@ -28,7 +28,7 @@ SRC_URI =
"http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \
file://0001-systemd-Add-optional-support-for-systemd-sd_notify.patch \
"
-SRC_URI[sha256sum] =
"910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c"
+SRC_URI[sha256sum] =
"490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd"
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."
--
2.42.0
0001-openssh-upgrade-9.6p1-9.7p1.patch
Description: Binary data
packages/core2-64-poky-linux/openssh: SRC_URI changed from "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.6p1.tar.gz file://sshd_config file://ssh_config file://init file://sshd file://sshd.service file://sshd.socket file://[email protected] file://sshdgenkeys.service file://volatiles.99_sshd file://run-ptest file://fix-potential-signed-overflow-in-pointer-arithmatic.patch file://sshd_check_keys file://add-test-support-for-busybox.patch file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch file://0001-systemd-Add-optional-support-for-systemd-sd_notify.patch" to "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.7p1.tar.gz file://sshd_config file://ssh_config file://init file://sshd file://sshd.service file://sshd.socket file://[email protected] file://sshdgenkeys.service file://volatiles.99_sshd file://run-ptest file://fix-potential-signed-overflow-in-pointer-arithmatic.patch file://sshd_check_keys file://add-test-support-for-busybox.patch file:// 0001-regress-banner.sh-log-input-and-output-files-on-erro.patch file://0001-systemd-Add-optional-support-for-systemd-sd_notify.patch" packages/core2-64-poky-linux/openssh: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-dbg: PKGSIZE changed from 22334184 to 22369056 (+0%) packages/core2-64-poky-linux/openssh/openssh-dbg: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-dbg: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-dev: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-dev: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-doc: PKGSIZE changed from 339983 to 340919 (+0%) packages/core2-64-poky-linux/openssh/openssh-doc: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-doc: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-keygen: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-keygen: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-locale: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-locale: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-misc: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-misc: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-ptest: PKGSIZE changed from 6203196 to 6211392 (+0%) packages/core2-64-poky-linux/openssh/openssh-ptest: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-ptest: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-scp: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-scp: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-sftp-server: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-sftp-server: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-sftp: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-sftp: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-src: PKGSIZE changed from 3738151 to 3744144 (+0%) packages/core2-64-poky-linux/openssh/openssh-src: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-src: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-ssh: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-ssh: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-sshd: PKGSIZE changed from 1642666 to 1650858 (+0%) packages/core2-64-poky-linux/openssh/openssh-sshd: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-sshd: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh-staticdev: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh-staticdev: PKGV changed from 9.6p1 [default] to 9.7p1 [default] packages/core2-64-poky-linux/openssh/openssh: PV changed from "9.6p1" to "9.7p1" packages/core2-64-poky-linux/openssh/openssh: PKGV changed from 9.6p1 [default] to 9.7p1 [default]
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#197702): https://lists.openembedded.org/g/openembedded-core/message/197702 Mute This Topic: https://lists.openembedded.org/mt/105271623/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
