Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *openssh* to *9.6p1* has Failed(do_compile).
Detailed error information:
do_compile failed
Next steps:
- apply the patch: git am 0001-openssh-upgrade-9.5p1-9.6p1.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 b0f04d69a668a26c92987303360a4465d154deef Mon Sep 17 00:00:00 2001
From: Upgrade Helper <[email protected]>
Date: Mon, 15 Jan 2024 05:37:20 +0000
Subject: [PATCH] openssh: upgrade 9.5p1 -> 9.6p1
---
...h-log-input-and-output-files-on-erro.patch | 10 +---
...tional-support-for-systemd-sd_notify.patch | 18 +++---
.../add-test-support-for-busybox.patch | 57 +++++++++++--------
...igned-overflow-in-pointer-arithmatic.patch | 6 +-
.../{openssh_9.5p1.bb => openssh_9.6p1.bb} | 2 +-
5 files changed, 47 insertions(+), 46 deletions(-)
rename meta/recipes-connectivity/openssh/{openssh_9.5p1.bb =>
openssh_9.6p1.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 2c14014fed..11756b3194 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 4be1055fe228d3fbab0bb90ae805a1d7af3b35c9 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
@@ -35,14 +35,13 @@ return value: 1
See: https://bugzilla.yoctoproject.org/show_bug.cgi?id=15178
Signed-off-by: Mikko Rapeli <[email protected]>
+
---
regress/banner.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-Upstream-Status: Denied [https://github.com/openssh/openssh-portable/pull/437]
-
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 +55,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..c39e919caa 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 46fee03df1a12d22a60edfd1c015ee0da5c17ac1 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`
@@ -9,16 +9,17 @@ patch based on Jakub Jelen's <[email protected]> original
patch
Upstream-Status: Submitted
[https://github.com/openssh/openssh-portable/pull/375/commits/be187435911cde6cc3cef6982a508261074f1e56]
Signed-off-by: Xiangyu Chen <[email protected]>
+
---
configure.ac | 24 ++++++++++++++++++++++++
sshd.c | 13 +++++++++++++
2 files changed, 37 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 22fee70f..486c189f 100644
+index 379cd74..a7d0e92 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -4835,6 +4835,29 @@ AC_SUBST([GSSLIBS])
+@@ -4842,6 +4842,29 @@ AC_SUBST([GSSLIBS])
AC_SUBST([K5LIBS])
AC_SUBST([CHANNELLIBS])
@@ -48,7 +49,7 @@ index 22fee70f..486c189f 100644
# Looking for programs, paths and files
PRIVSEP_PATH=/var/empty
-@@ -5634,6 +5657,7 @@ echo " libldns support: $LDNS_MSG"
+@@ -5650,6 +5673,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 +58,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 9cbe922..4b342c5 100644
--- a/sshd.c
+++ b/sshd.c
@@ -88,6 +88,10 @@
@@ -71,7 +72,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 +83,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 +95,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..9bf40ecc62 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,4 +1,7 @@
-Adjust test cases to work with busybox.
+From 6f92f2b07c2b55d1e62221aa3123135298686348 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>".
@@ -6,11 +9,17 @@ Adjust test cases to work with busybox.
Signed-off-by: Maxin B. John <[email protected]>
Upstream-Status: Pending
-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
+---
+ regress/cipher-speed.sh | 2 +-
+ regress/key-options.sh | 2 +-
+ regress/transfer.sh | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+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 +28,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 +41,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..58e77776a6 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 9f9e1c18db6f7358950a49f0350bc7fc35673bea 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
@@ -14,6 +14,7 @@ Signed-off-by: Yuanjie Huang <[email protected]>
Complete the fix
Signed-off-by: Hongxu Jia <[email protected]>
+
---
openbsd-compat/strlcat.c | 10 +++++++---
openbsd-compat/strlcpy.c | 8 ++++++--
@@ -106,6 +107,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.5p1.bb
b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
similarity index 99%
rename from meta/recipes-connectivity/openssh/openssh_9.5p1.bb
rename to meta/recipes-connectivity/openssh/openssh_9.6p1.bb
index 0312d5bd66..6366cefdf9 100644
--- a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_9.6p1.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] =
"f026e7b79ba7fb540f75182af96dc8a8f1db395f922bbc9f6ca603672686086b"
+SRC_URI[sha256sum] =
"910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c"
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
NOTE: Reconnecting to bitbake server... Loading cache...done. Loaded 1852 entries from dependency cache. Parsing recipes...done. Parsing of 914 .bb files complete (913 cached, 1 parsed). 1850 targets, 38 skipped, 0 masked, 0 errors. Removing 1 recipes from the core2-64 sysroot...done. Removing 1 recipes from the qemux86_64 sysroot...done. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "2.7.1" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "4.3+snapshot-1d0f73bf6e5bff63ecf5ef6e6e0ee3f7f766babd" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp workspace = "tmp-auh-upgrades:1d0f73bf6e5bff63ecf5ef6e6e0ee3f7f766babd" Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing build without monitoring pressure Sstate summary: Wanted 346 Local 335 Mirrors 0 Missed 11 Current 411 (96% match, 98% complete) done. NOTE: Executing Tasks NOTE: Running setscene task 423 of 757 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-connectivity/openssh/openssh_9.6p1.bb:do_recipe_qa_setscene) NOTE: recipe openssh-9.6p1-r0: task do_recipe_qa_setscene: Started NOTE: recipe openssh-9.6p1-r0: task do_recipe_qa_setscene: Succeeded NOTE: Setscene tasks completed NOTE: Running task 1455 of 2092 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-connectivity/openssh/openssh_9.6p1.bb:do_fetch) NOTE: recipe openssh-9.6p1-r0: task do_fetch: Started NOTE: recipe openssh-9.6p1-r0: task do_fetch: Succeeded NOTE: Running task 1979 of 2092 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-connectivity/openssh/openssh_9.6p1.bb:do_unpack) NOTE: Running task 1980 of 2092 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-connectivity/openssh/openssh_9.6p1.bb:do_prepare_recipe_sysroot) NOTE: recipe openssh-9.6p1-r0: task do_unpack: Started NOTE: recipe openssh-9.6p1-r0: task do_prepare_recipe_sysroot: Started NOTE: recipe openssh-9.6p1-r0: task do_unpack: Succeeded NOTE: Running task 2073 of 2092 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-connectivity/openssh/openssh_9.6p1.bb:do_patch) NOTE: Running task 2074 of 2092 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-connectivity/openssh/openssh_9.6p1.bb:do_collect_spdx_deps) NOTE: recipe openssh-9.6p1-r0: task do_patch: Started NOTE: recipe openssh-9.6p1-r0: task do_collect_spdx_deps: Started NOTE: recipe openssh-9.6p1-r0: task do_collect_spdx_deps: Succeeded NOTE: recipe openssh-9.6p1-r0: task do_prepare_recipe_sysroot: Succeeded NOTE: recipe openssh-9.6p1-r0: task do_patch: Failed NOTE: Tasks Summary: Attempted 2074 tasks of which 2069 didn't need to be rerun and 1 failed. NOTE: Writing buildhistory NOTE: Writing buildhistory took: 3 seconds NOTE: The errors for this build are stored in /home/pokybuild/yocto-worker/auh/build/build/tmp/log/error-report/error_report_20240115053700.txt You can send the errors to a reports server by running: send-error-report /home/pokybuild/yocto-worker/auh/build/build/tmp/log/error-report/error_report_20240115053700.txt [-s server] NOTE: The contents of these logs will be posted in public if you use the above command with the default server. Please ensure you remove any identifying or proprietary information when prompted before sending. Summary: 1 task failed: /home/pokybuild/yocto-worker/auh/build/meta/recipes-connectivity/openssh/openssh_9.6p1.bb:do_patch Summary: There were 2 ERROR messages, returning a non-zero exit code. ERROR: openssh-9.6p1-r0 do_patch: QA Issue: Missing Upstream-Status in patch /home/pokybuild/yocto-worker/auh/build/meta/recipes-connectivity/openssh/openssh/0001-regress-banner.sh-log-input-and-output-files-on-erro.patch Please add according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status . [patch-status] ERROR: openssh-9.6p1-r0 do_patch: Fatal QA errors were found, failing task. ERROR: Logfile of failure stored in: /home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/openssh/9.6p1/temp/log.do_patch.1144458 ERROR: Task (/home/pokybuild/yocto-worker/auh/build/meta/recipes-connectivity/openssh/openssh_9.6p1.bb:do_patch) failed with exit code '1'
0001-openssh-upgrade-9.5p1-9.6p1.patch
Description: Binary data
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#193700): https://lists.openembedded.org/g/openembedded-core/message/193700 Mute This Topic: https://lists.openembedded.org/mt/103744038/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
