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 82b1c4089f2dfade956a5ff71f1409d11101bcf2 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <a...@yoctoproject.org>
Date: Mon, 1 Jan 2024 05:18:54 +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} (98%)
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..e9efe4fbb5 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 dc232dec5b3e2986e2450f8454b248e827330c4d Mon Sep 17 00:00:00 2001
From: Mikko Rapeli <mikko.rap...@linaro.org>
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 <mikko.rap...@linaro.org>
+
---
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..d8bea0d6d3 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 38f0418c7fda61019ba1956a1464b22eaf49ec0a Mon Sep 17 00:00:00 2001
From: Matt Jolly <Matt.Jolly@footclan.ninja>
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 <jje...@redhat.com> original
patch
Upstream-Status: Submitted
[https://github.com/openssh/openssh-portable/pull/375/commits/be187435911cde6cc3cef6982a508261074f1e56]
Signed-off-by: Xiangyu Chen <xiangyu.c...@windriver.com>
+
---
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..af52ebd76b 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 49085e7bab0fe94bf66af431f7b3feee2a0922a3 Mon Sep 17 00:00:00 2001
+From: "Maxin B. John" <maxin.j...@enea.com>
+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 <maxin.j...@enea.com>
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..1ae328cb43 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 6e81e658fe420e5b4809bd78e50becdb3128217c Mon Sep 17 00:00:00 2001
From: Yuanjie Huang <yuanjie.hu...@windriver.com>
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 <yuanjie.hu...@windriver.com>
Complete the fix
Signed-off-by: Hongxu Jia <hongxu....@windriver.com>
+
---
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 98%
rename from meta/recipes-connectivity/openssh/openssh_9.5p1.bb
rename to meta/recipes-connectivity/openssh/openssh_9.6p1.bb
index bbb8fb091a..fa44eb0bd4 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
0001-openssh-upgrade-9.5p1-9.6p1.patch
Description: Binary data
NOTE: Reconnecting to bitbake server... Loading cache...done. Loaded 1849 entries from dependency cache. Parsing recipes...done. Parsing of 913 .bb files complete (912 cached, 1 parsed). 1847 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.6.1" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "4.3+snapshot-124b4848b29ca319e3c84ab8bbf47f69c655fab4" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp workspace = "tmp-auh-upgrades:124b4848b29ca319e3c84ab8bbf47f69c655fab4" Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing build without monitoring pressure Sstate summary: Wanted 355 Local 343 Mirrors 0 Missed 12 Current 397 (96% match, 98% complete) done. NOTE: Executing Tasks NOTE: Setscene tasks completed NOTE: Running task 1446 of 2078 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-connectivity/openssh/openssh_9.6p1.bb:do_recipe_qa) NOTE: recipe openssh-9.6p1-r0: task do_recipe_qa: Started NOTE: recipe openssh-9.6p1-r0: task do_recipe_qa: Succeeded NOTE: Running task 2056 of 2078 (/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 2057 of 2078 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-connectivity/openssh/openssh_9.6p1.bb:do_unpack) NOTE: Running task 2058 of 2078 (/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 2059 of 2078 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-connectivity/openssh/openssh_9.6p1.bb:do_patch) NOTE: Running task 2060 of 2078 (/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 2060 tasks of which 2054 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_20240101051834.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_20240101051834.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.1773482 ERROR: Task (/home/pokybuild/yocto-worker/auh/build/meta/recipes-connectivity/openssh/openssh_9.6p1.bb:do_patch) failed with exit code '1'
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#193100): https://lists.openembedded.org/g/openembedded-core/message/193100 Mute This Topic: https://lists.openembedded.org/mt/103461897/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
