Patch review
cover Patch review
Please review this set of changes for scarthgap and have comments back by end of day Wednesday, July 31
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/7188
with the exception on a failure on the meta-agl-core test due to the weston version bump (a bug/security fix release):
https://autobuilder.yoctoproject.org/typhoon/#/builders/120/builds/4544/steps/12/logs/stdio
There is already a fix for this in the meta-agl next branch which will need to be backported.
The following changes since commit c00a9a8f25b0042b0723a5d20b88e92d473d22bf:
insane.bbclass: remove leftover variables and comment (2024-07-22 08:04:58 -0700)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/scarthgap-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/scarthgap-nut
Aleksandar Nikolic (1):
cve-check: Introduce CVE_CHECK_MANIFEST_JSON_SUFFIX
Alexander Kanavin (8):
python3: submit deterministic_imports.patch upstream as a ticket
glib-networking: submit eagain.patch upstream
glslang: mark 0001-generate-glslang-pkg-config.patch as Inappropriate
tcp-wrappers: mark all patches as inactive-upstream
automake: mark new_rt_path_for_test-driver.patch as Inappropriate
settings-daemon: submit addsoundkeys.patch upstream and update to a
revision that has it
dpkg: mark patches adding custom non-debian architectures as
inappropriate for upstream
libacpi: mark patches as inactive-upstream
Archana Polampalli (3):
ofono: fix CVE-2023-2794
ffmpeg: fix CVE-2023-49502
ffmpeg: fix CVE-2024-31578
Benjamin Szőke (1):
archiver.bbclass: Fix work-shared checking for kernel recipes
Denys Dmytriyenko (1):
weston: upgrade 13.0.0 -> 13.0.1
Enrico Jörns (1):
wic: bootimg-efi: fix error handling
Etienne Cordonnier (2):
oeqa/runtime: make minidebuginfo test work with coreutils oeqa/runtime: fix race-condition in minidebuginfo test
Guðni Már Gilbert (2):
pam: Fix for CVE-2024-22365
python3-attrs: drop python3-ctypes from RDEPENDS
Jose Quaresma (4):
oeqa/runtime/scp: requires openssh-sftp-server
openssh: drop rejected patch fixed in 8.6p1 release
openssh: systemd sd-notify patch was rejected upstream
openssh: systemd notification was implemented upstream
Jörg Sommer (1):
classes/kernel: No symlink in postinst without
KERNEL_IMAGETYPE_SYMLINK
Kai Kang (2):
multilib.bbclass: replace deprecated e.data with d cmake-qemu.bbclass: fix if criterion
Khem Raj (3):
grub,grub-efi: Remove -mfpmath=sse on x86
python3: Treat UID/GID overflow as failure
gawk: Remove References to /usr/local/bin/gawk
Kirill Yatsenko (1):
iptables: fix save/restore symlinks with libnftnl PACKAGECONFIG
enabled
Martin Jansa (1):
selftest: add Upstream-Status to .patch files
Michael Opdenacker (1):
maintainers.inc: update self e-mail address
Richard Purdie (1):
oeqa/sdk/case: Ensure DL_DIR is populated with artefacts if used
Ross Burton (1):
gawk: update patch status
Soumya Sambu (1):
python3-idna: upgrade 3.6 -> 3.7
Trevor Gamblin (2):
python3: skip test_concurrent_futures/test_deadlock
python3: skip test_multiprocessing/test_active_children test
.../hello-rs/0001-Greet-OE-Core.patch | 2 +-
.../devtool-patch-overrides/qemuarm/arm.patch | 2 +
.../devtool-patch-overrides/qemux86/x86.patch | 2 +
.../devtool-test-ignored.patch | 2 +
.../devtool-test-ignored.patch.expected | 1 +
...nly-if-devtool-lets-me-to-do-it-corr.patch | 2 +
...vtool-lets-me-to-do-it-corr.patch.expected | 1 +
...d-a-note-line-to-the-quick-reference.patch | 2 +
.../backported.patch | 2 +
.../gitrepotest/0001-testpatch.patch | 2 +
.../man-db/files/0001-Test-patch-here.patch | 2 +
.../recipetool/files/add-file.patch | 2 +
meta/classes-recipe/cmake-qemu.bbclass | 2 +-
meta/classes-recipe/kernel.bbclass | 6 +-
meta/classes/archiver.bbclass | 3 +-
meta/classes/cve-check.bbclass | 6 +-
meta/classes/multilib.bbclass | 87 +++----
meta/classes/multilib_global.bbclass | 25 +-
meta/conf/distro/include/maintainers.inc | 22 +-
meta/lib/oeqa/runtime/cases/scp.py | 2 +-
meta/lib/oeqa/runtime/cases/systemd.py | 20 +-
meta/lib/oeqa/sdk/case.py | 9 +-
meta/recipes-bsp/grub/grub2.inc | 4 +
...1-libacpi-Fix-build-witth-fno-commom.patch | 2 +-
meta/recipes-bsp/libacpi/files/ldflags.patch | 3 +-
.../libacpi/files/libacpi_fix_for_x32.patch | 2 +-
.../libacpi/files/makefile-fix.patch | 2 +-
...e_correct_strip_in_cross_environment.patch | 2 +-
.../ofono/ofono/CVE-2023-2794-0001.patch | 38 +++
.../ofono/ofono/CVE-2023-2794-0002.patch | 33 +++
.../ofono/ofono/CVE-2023-2794-0003.patch | 45 ++++
.../ofono/ofono/CVE-2023-2794-0004.patch | 128 ++++++++++
meta/recipes-connectivity/ofono/ofono_2.4.bb | 4 +
...-notify-systemd-on-listen-and-reload.patch | 225 ++++++++++++++++++
...tional-support-for-systemd-sd_notify.patch | 99 --------
...igned-overflow-in-pointer-arithmatic.patch | 111 ---------
.../openssh/openssh/sshd.service | 2 +-
.../openssh/openssh_9.6p1.bb | 5 +-
.../glib-networking/eagain.patch | 2 +-
.../new_rt_path_for_test-driver.patch | 2 +-
.../0001-Add-support-for-riscv32-CPU.patch | 2 +-
.../0001-dpkg-Support-muslx32-build.patch | 2 +-
...add-musleabi-to-known-target-tripets.patch | 2 +-
.../dpkg/dpkg/add_armeb_triplet_entry.patch | 2 +-
meta/recipes-devtools/dpkg/dpkg/arch_pm.patch | 2 +-
.../python/python3-attrs_23.2.0.bb | 1 -
...ython3-idna_3.6.bb => python3-idna_3.7.bb} | 4 +-
...e-treat-overflow-in-UID-GID-as-failu.patch | 40 ++++
...ctive_children-skip-problematic-test.patch | 30 +++
...-test_deadlock-skip-problematic-test.patch | 30 +++
.../python3/deterministic_imports.patch | 2 +-
.../recipes-devtools/python/python3_3.12.4.bb | 3 +
...001-m4-readline-add-missing-includes.patch | 2 +-
meta/recipes-extended/gawk/gawk_5.3.0.bb | 2 +
.../iptables/iptables_1.8.10.bb | 2 +
.../pam/libpam/CVE-2024-22365.patch | 65 +++++
meta/recipes-extended/pam/libpam_1.5.3.bb | 1 +
.../0001-Fix-build-with-clang.patch | 2 +-
...plicit-function-declaration-warnings.patch | 2 +-
...0001-Remove-fgets-extern-declaration.patch | 2 +-
.../tcp-wrappers-7.6/00_man_quoting.diff | 2 +-
.../tcp-wrappers-7.6/01_man_portability.patch | 2 +-
.../05_wildcard_matching.patch | 2 +-
.../06_fix_gethostbyname.patch | 2 +-
.../tcp-wrappers-7.6/10_usagi-ipv6.patch | 2 +-
.../tcp-wrappers-7.6/11_tcpd_blacklist.patch | 2 +-
.../tcp-wrappers-7.6/11_usagi_fix.patch | 2 +-
.../tcp-wrappers-7.6/12_makefile_config.patch | 2 +-
.../tcp-wrappers-7.6/13_shlib_weaksym.patch | 2 +-
.../tcp-wrappers-7.6/14_cidr_support.patch | 2 +-
.../tcp-wrappers-7.6/15_match_clarify.patch | 2 +-
.../tcp-wrappers-7.6/expand_remote_port.patch | 2 +-
.../tcp-wrappers-7.6/fix_warnings.patch | 2 +-
.../tcp-wrappers-7.6/fix_warnings2.patch | 2 +-
.../tcp-wrappers-7.6/have_strerror.patch | 2 +-
.../tcp-wrappers-7.6/ldflags.patch | 2 +-
.../makefile-fix-parallel.patch | 2 +-
.../tcp-wrappers-7.6/man_fromhost.patch | 2 +-
.../tcp-wrappers-7.6/musl-decls.patch | 2 +-
.../rename_strings_variable.patch | 2 +-
.../tcp-wrappers-7.6/restore_sigalarm.patch | 2 +-
.../tcp-wrappers/tcp-wrappers-7.6/rfc931.diff | 2 +-
.../tcp-wrappers-7.6/safe_finger.patch | 2 +-
.../tcp-wrappers-7.6/sig_fix.patch | 2 +-
.../tcp-wrappers-7.6/siglongjmp.patch | 2 +-
.../tcp-wrappers-7.6/socklen_t.patch | 2 +-
.../tcp-wrappers-7.6/tcpdchk_libwrapped.patch | 2 +-
.../0001-generate-glslang-pkg-config.patch | 2 +-
...Include-libgen.h-for-basename-signat.patch | 13 +-
.../{weston_13.0.0.bb => weston_13.0.1.bb} | 2 +-
.../ffmpeg/ffmpeg/CVE-2023-49502.patch | 107 +++++++++
.../ffmpeg/ffmpeg/CVE-2024-31578.patch | 49 ++++
.../recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | 2 +
.../settings-daemon/files/addsoundkeys.patch | 49 ----
.../settings-daemon/settings-daemon_0.0.2.bb | 8 +-
scripts/lib/wic/plugins/source/bootimg-efi.py | 4 +-
96 files changed, 990 insertions(+), 411 deletions(-)
create mode 100644 meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0001.patch
create mode 100644 meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0002.patch
create mode 100644 meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0003.patch
create mode 100644 meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0004.patch
create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-notify-systemd-on-listen-and-reload.patch
delete mode 100644 meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch
delete mode 100644 meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch
rename meta/recipes-devtools/python/{python3-idna_3.6.bb => python3-idna_3.7.bb} (62%)
create mode 100644 meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch
create mode 100644 meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch
create mode 100644 meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch
create mode 100644 meta/recipes-extended/pam/libpam/CVE-2024-22365.patch
rename meta/recipes-graphics/wayland/{weston_13.0.0.bb => weston_13.0.1.bb} (98%)
create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2023-49502.patch
create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-31578.patch
delete mode 100644 meta/recipes-sato/settings-daemon/files/addsoundkeys.patchSignature · 1 line
2.34.1
PATCH 1/37 ofono: fix CVE-2023-2794
From: Archana Polampalli <[email protected]>
--- .../ofono/ofono/CVE-2023-2794-0001.patch | 38 ++++++ .../ofono/ofono/CVE-2023-2794-0002.patch | 33 +++++ .../ofono/ofono/CVE-2023-2794-0003.patch | 45 ++++++ .../ofono/ofono/CVE-2023-2794-0004.patch | 128 ++++++++++++++++++ meta/recipes-connectivity/ofono/ofono_2.4.bb | 4 + 5 files changed, 248 insertions(+) create mode 100644 meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0001.patch create mode 100644 meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0002.patch create mode 100644 meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0003.patch create mode 100644 meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0004.patch
meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0001.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 9c7a7fe29605d3d8bb5c0cfcee21a8f01ab9f4aa Mon Sep 17 00:00:00 2001 +From: Denis Kenzior <[email protected]> +Date: Thu, 29 Feb 2024 11:18:25 -0600 +Subject: [PATCH 1/4] smsutil: ensure the address length in bytes <= 10 + +If a specially formatted SMS is received, it is conceivable that the +address length might overflow the structure it is being parsed into. +Ensure that the length in bytes of the address never exceeds 10. + +CVE: CVE-2023-2794 + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/ofono/ofono.git/commit/?id=a90421d8e45d63b304dc010baba24633e7869682] + +Signed-off-by: Archana Polampalli <[email protected]> +--- + src/smsutil.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/smsutil.c b/src/smsutil.c +index f46507f..d3844f3 100644 +--- a/src/smsutil.c ++++ b/src/smsutil.c +@@ -643,7 +643,12 @@ gboolean sms_decode_address_field(const unsigned char *pdu, int len, + else + byte_len = (addr_len + 1) / 2; + +- if ((len - *offset) < byte_len) ++ /* ++ * 23.040: ++ * The maximum length of the full address field ++ * (AddressLength, TypeofAddress and AddressValue) is 12 octets. ++ */ ++ if ((len - *offset) < byte_len || byte_len > 10) + return FALSE; + + out->number_type = bit_field(addr_type, 4, 3); +-- +2.40.0
meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0002.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 3f58f4f5260be9e9e46bc50382768563a5ce2bcd Mon Sep 17 00:00:00 2001 +From: Denis Kenzior <[email protected]> +Date: Thu, 29 Feb 2024 11:42:28 -0600 +Subject: [PATCH 2/4] smsutil: Check cbs_dcs_decode return value + +It is better to explicitly check the return value of cbs_dcs_decode +instead of relying on udhi not being changed due to side-effects. + +CVE: CVE-2023-2794 + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/ofono/ofono.git/commit/?id=7f2adfa22fbae824f8e2c3ae86a3f51da31ee400] + +Signed-off-by: Archana Polampalli <[email protected]> +--- + src/smsutil.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/smsutil.c b/src/smsutil.c +index d3844f3..cfa157a 100644 +--- a/src/smsutil.c ++++ b/src/smsutil.c +@@ -1765,7 +1765,8 @@ gboolean sms_udh_iter_init_from_cbs(const struct cbs *cbs, + const guint8 *hdr; + guint8 max_ud_len; + +- cbs_dcs_decode(cbs->dcs, &udhi, NULL, NULL, NULL, NULL, NULL); ++ if (!cbs_dcs_decode(cbs->dcs, &udhi, NULL, NULL, NULL, NULL, NULL)) ++ return FALSE; + + if (!udhi) + return FALSE; +-- +2.40.0
meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0003.patch new file +45 -0
45 lines not on this page · raw message
meta/recipes-connectivity/ofono/ofono/CVE-2023-2794-0004.patch new file +128 -0
128 lines not on this page · raw message
meta/recipes-connectivity/ofono/ofono_2.4.bb +4 -0
@@ -12,6 +12,10 @@ SRC_URI = "\ file://ofono \ file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \ file://0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch \ + file://CVE-2023-2794-0001.patch \ + file://CVE-2023-2794-0002.patch \ + file://CVE-2023-2794-0003.patch \ + file://CVE-2023-2794-0004.patch \ " SRC_URI[sha256sum] = "93580adc1afd1890dc516efb069de0c5cdfef014415256ddfb28ab172df2d11d"
Signature · 1 line
2.34.1
PATCH 2/37 ffmpeg: fix CVE-2023-49502
In reply to Steve SakomanFrom: Archana Polampalli <[email protected]>
Buffer Overflow vulnerability in Ffmpeg v.n6.1-3-g466799d4f5 allows a local attacker to execute arbitrary code via the ff_bwdif_filter_intra_c function in the libavfilter/bwdifdsp.c:125:5 component.
--- .../ffmpeg/ffmpeg/CVE-2023-49502.patch | 107 ++++++++++++++++++ .../recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | 1 + 2 files changed, 108 insertions(+) create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2023-49502.patch
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2023-49502.patch new file +107 -0
@@ -0,0 +1,107 @@ +From 737ede405b11a37fdd61d19cf25df296a0cb0b75 Mon Sep 17 00:00:00 2001 +From: Cosmin Stejerean <[email protected]> +Date: Wed, 6 Dec 2023 18:39:32 +0800 +Subject: [PATCH] avfilter/bwdif: account for chroma sub-sampling in min size + calculation + +The current logic for detecting frames that are too small for the +algorithm does not account for chroma sub-sampling, and so a sample +where the luma plane is large enough, but the chroma planes are not +will not be rejected. In that event, a heap overflow will occur. + +This change adjusts the logic to consider the chroma planes and makes +the change to all three bwdif implementations. + +Fixes #10688 + +Signed-off-by: Cosmin Stejerean <[email protected]> +Reviewed-by: Thomas Mundt <[email protected]> +Signed-off-by: Philip Langdale <[email protected]> + +CVE: CVE-2023-49502 + +Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/737ede405b11a37f] + +Signed-off-by: Archana Polampalli <[email protected]> +--- + libavfilter/vf_bwdif.c | 9 +++++---- + libavfilter/vf_bwdif_cuda.c | 11 ++++++----- + libavfilter/vf_bwdif_vulkan.c | 11 +++++------ + 3 files changed, 16 insertions(+), 15 deletions(-) + +diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c +index 137cd5e..353cd0b 100644 +--- a/libavfilter/vf_bwdif.c ++++ b/libavfilter/vf_bwdif.c +@@ -191,13 +191,14 @@ static int config_props(AVFilterLink *link) + return ret; + } + +- if (link->w < 3 || link->h < 4) { +- av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or 4 lines is not supported\n"); ++ yadif->csp = av_pix_fmt_desc_get(link->format); ++ yadif->filter = filter; ++ ++ if (AV_CEIL_RSHIFT(link->w, yadif->csp->log2_chroma_w) < 3 || AV_CEIL_RSHIFT(link->h, yadif->csp->log2_chroma_h) < 4) { ++ av_log(ctx, AV_LOG_ERROR, "Video with planes less than 3 columns or 4 lines is not supported\n"); + return AVERROR(EINVAL); + } + +- yadif->csp = av_pix_fmt_desc_get(link->format); +- yadif->filter = filter; + ff_bwdif_init_filter_line(&s->dsp, yadif->csp->comp[0].depth); + + return 0; +diff --git a/libavfilter/vf_bwdif_cuda.c b/libavfilter/vf_bwdif_cuda.c +index a5ecfba..418f15f 100644 +--- a/libavfilter/vf_bwdif_cuda.c ++++ b/libavfilter/vf_bwdif_cuda.c +@@ -296,15 +296,16 @@ static int config_output(AVFilterLink *link) + link->frame_rate = av_mul_q(ctx->inputs[0]->frame_rate, + (AVRational){2, 1}); + +- if (link->w < 3 || link->h < 3) { +- av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or lines is not supported\n"); +- ret = AVERROR(EINVAL); +- goto exit; +- } + + y->csp = av_pix_fmt_desc_get(output_frames->sw_format); + y->filter = filter; + ++ if (AV_CEIL_RSHIFT(link->w, y->csp->log2_chroma_w) < 3 || AV_CEIL_RSHIFT(link->h, y->csp->log2_chroma_h) < 3) { ++ av_log(ctx, AV_LOG_ERROR, "Video with planes less than 3 columns or lines is not supported\n"); ++ ret = AVERROR(EINVAL); ++ goto exit; ++ } ++ + ret = CHECK_CU(cu->cuCtxPushCurrent(s->hwctx->cuda_ctx)); + if (ret < 0) + goto exit; +diff --git a/libavfilter/vf_bwdif_vulkan.c b/libavfilter/vf_bwdif_vulkan.c +index 690a89c..c51df9a 100644 +--- a/libavfilter/vf_bwdif_vulkan.c ++++ b/libavfilter/vf_bwdif_vulkan.c +@@ -362,15 +362,14 @@ static int bwdif_vulkan_config_output(AVFilterLink *outlink) + outlink->frame_rate = av_mul_q(avctx->inputs[0]->frame_rate, + (AVRational){2, 1}); + +- if (outlink->w < 4 || outlink->h < 4) { +- av_log(avctx, AV_LOG_ERROR, "Video of less than 4 columns or lines is not " +- "supported\n"); +- return AVERROR(EINVAL); +- } +- + y->csp = av_pix_fmt_desc_get(vkctx->frames->sw_format); + y->filter = bwdif_vulkan_filter_frame; + ++ if (AV_CEIL_RSHIFT(outlink->w, y->csp->log2_chroma_w) < 4 || AV_CEIL_RSHIFT(outlink->h, y->csp->log2_chroma_h) < 4) { ++ av_log(avctx, AV_LOG_ERROR, "Video with planes less than 4 columns or lines is not supported\n"); ++ return AVERROR(EINVAL); ++ } ++ + return init_filter(avctx); + } + +-- +2.40.0
meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb +1 -0
@@ -27,6 +27,7 @@ SRC_URI = " \ file://av1_ordering_info.patch \ file://vulkan_av1_stable_API.patch \ file://vulkan_fix_gcc14.patch \ + file://CVE-2023-49502.patch \ " SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968"
Signature · 1 line
2.34.1
PATCH 3/37 ffmpeg: fix CVE-2024-31578
In reply to Steve SakomanFrom: Archana Polampalli <[email protected]>
FFmpeg version n6.1.1 was discovered to contain a heap use-after-free via the av_hwframe_ctx_init function.
--- .../ffmpeg/ffmpeg/CVE-2024-31578.patch | 49 +++++++++++++++++++ .../recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-31578.patch
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-31578.patch new file +49 -0
@@ -0,0 +1,49 @@ +From edeeb35cecb5bc0d433b14dd0e544ae826b7ece5 Mon Sep 17 00:00:00 2001 +From: Zhao Zhili <[email protected]> +Date: Tue, 20 Feb 2024 20:08:55 +0800 +Subject: [PATCH] avutil/hwcontext: Don't assume frames_uninit is reentrant + +Fix heap use after free when vulkan_frames_init failed. + +Signed-off-by: Zhao Zhili <[email protected]> + +CVE: CVE-2024-31578 + +Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/3bb00c0a420c3ce83] + +Signed-off-by: Archana Polampalli <[email protected]> +--- + libavutil/hwcontext.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c +index 3650d46..0ef3479 100644 +--- a/libavutil/hwcontext.c ++++ b/libavutil/hwcontext.c +@@ -363,7 +363,7 @@ int av_hwframe_ctx_init(AVBufferRef *ref) + if (ctx->internal->hw_type->frames_init) { + ret = ctx->internal->hw_type->frames_init(ctx); + if (ret < 0) +- goto fail; ++ return ret; + } + + if (ctx->internal->pool_internal && !ctx->pool) +@@ -373,14 +373,10 @@ int av_hwframe_ctx_init(AVBufferRef *ref) + if (ctx->initial_pool_size > 0) { + ret = hwframe_pool_prealloc(ref); + if (ret < 0) +- goto fail; ++ return ret; + } + + return 0; +-fail: +- if (ctx->internal->hw_type->frames_uninit) +- ctx->internal->hw_type->frames_uninit(ctx); +- return ret; + } + + int av_hwframe_transfer_get_formats(AVBufferRef *hwframe_ref, +-- +2.40.0
meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb +1 -0
@@ -28,6 +28,7 @@ SRC_URI = " \ file://vulkan_av1_stable_API.patch \ file://vulkan_fix_gcc14.patch \ file://CVE-2023-49502.patch \ + file://CVE-2024-31578.patch \ " SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968"
Signature · 1 line
2.34.1
PATCH 4/37 pam: Fix for CVE-2024-22365
In reply to Steve SakomanFrom: Guðni Már Gilbert <[email protected]>
Upstream-Status: Backport from https://github.com/linux-pam/linux-pam/commit/031bb5a5d0d950253b68138b498dc93be69a64cb
--- .../pam/libpam/CVE-2024-22365.patch | 65 +++++++++++++++++++ meta/recipes-extended/pam/libpam_1.5.3.bb | 1 + 2 files changed, 66 insertions(+) create mode 100644 meta/recipes-extended/pam/libpam/CVE-2024-22365.patch
meta/recipes-extended/pam/libpam/CVE-2024-22365.patch new file +65 -0
@@ -0,0 +1,65 @@ +From 84f378d3b8573828e7ccc54b54b5e128aa993748 Mon Sep 17 00:00:00 2001 +From: Matthias Gerstner <[email protected]> +Date: Wed, 27 Dec 2023 14:01:59 +0100 +Subject: [PATCH] pam_namespace: protect_dir(): use O_DIRECTORY to prevent + local DoS situations +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without O_DIRECTORY the path crawling logic is subject to e.g. FIFOs +being placed in user controlled directories, causing the PAM module to +block indefinitely during `openat()`. + +Pass O_DIRECTORY to cause the `openat()` to fail if the path does not +refer to a directory. + +With this the check whether the final path element is a directory +becomes unnecessary, drop it. + +Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/031bb5a5d0d950253b68138b498dc93be69a64cb] +CVE: CVE-2024-22365 +Signed-off-by: Guðni Már Gilbert <[email protected]> +--- + modules/pam_namespace/pam_namespace.c | 18 +----------------- + 1 file changed, 1 insertion(+), 17 deletions(-) + +diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c +index f34ce934..ef856443 100644 +--- a/modules/pam_namespace/pam_namespace.c ++++ b/modules/pam_namespace/pam_namespace.c +@@ -1194,7 +1194,7 @@ static int protect_dir(const char *path, mode_t mode, int do_mkdir, + int dfd = AT_FDCWD; + int dfd_next; + int save_errno; +- int flags = O_RDONLY; ++ int flags = O_RDONLY | O_DIRECTORY; + int rv = -1; + struct stat st; + +@@ -1248,22 +1248,6 @@ static int protect_dir(const char *path, mode_t mode, int do_mkdir, + rv = openat(dfd, dir, flags); + } + +- if (rv != -1) { +- if (fstat(rv, &st) != 0) { +- save_errno = errno; +- close(rv); +- rv = -1; +- errno = save_errno; +- goto error; +- } +- if (!S_ISDIR(st.st_mode)) { +- close(rv); +- errno = ENOTDIR; +- rv = -1; +- goto error; +- } +- } +- + if (flags & O_NOFOLLOW) { + /* we are inside user-owned dir - protect */ + if (protect_mount(rv, p, idata) == -1) { +-- +2.43.0 +
meta/recipes-extended/pam/libpam_1.5.3.bb +1 -0
@@ -26,6 +26,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/Linux-PAM-${PV}.tar.xz \ file://pam-volatiles.conf \ file://0001-pam_namespace-include-stdint-h.patch \ file://0001-pam_pwhistory-fix-passing-NULL-filename-argument-to-.patch \ + file://CVE-2024-22365.patch \ " SRC_URI[sha256sum] = "7ac4b50feee004a9fa88f1dfd2d2fa738a82896763050cd773b3c54b0a818283"
Signature · 1 line
2.34.1
PATCH 5/37 cve-check: Introduce CVE_CHECK_MANIFEST_JSON_SUFFIX
In reply to Steve SakomanFrom: Aleksandar Nikolic <[email protected]>
The variable contains the suffix of the CVE JSON manifest file. By default, this variable is set to 'json', so the current behavior is not changed, but enables developers to use some other suffix, e.g., cve.json (similar to spdx.json).
--- meta/classes/cve-check.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta/classes/cve-check.bbclass +4 -2
@@ -49,7 +49,8 @@ CVE_CHECK_DIR ??= "${DEPLOY_DIR}/cve" CVE_CHECK_RECIPE_FILE ?= "${CVE_CHECK_DIR}/${PN}" CVE_CHECK_RECIPE_FILE_JSON ?= "${CVE_CHECK_DIR}/${PN}_cve.json" CVE_CHECK_MANIFEST ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.cve" -CVE_CHECK_MANIFEST_JSON ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.json" +CVE_CHECK_MANIFEST_JSON_SUFFIX ?= "json" +CVE_CHECK_MANIFEST_JSON ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.${CVE_CHECK_MANIFEST_JSON_SUFFIX}" CVE_CHECK_COPY_FILES ??= "1" CVE_CHECK_CREATE_MANIFEST ??= "1"
@@ -278,7 +279,8 @@ python cve_check_write_rootfs_manifest () { bb.plain("Image CVE report stored in: %s" % manifest_name) if enable_json: - link_path = os.path.join(deploy_dir, "%s.json" % link_name) + manifest_name_suffix = d.getVar("CVE_CHECK_MANIFEST_JSON_SUFFIX") + link_path = os.path.join(deploy_dir, "%s.%s" % (link_name, manifest_name_suffix)) manifest_name = d.getVar("CVE_CHECK_MANIFEST_JSON") with open(manifest_name, "w") as f:
Signature · 1 line
2.34.1
PATCH 6/37 weston: upgrade 13.0.0 -> 13.0.1
In reply to Steve SakomanFrom: Denys Dmytriyenko <[email protected]>
Weston 13.0.1, a bug fix release for 13.0.0 has been released.
Full changelog:
https://lists.freedesktop.org/archives/wayland-devel/2024-April/043575.html
---
...tools-Include-libgen.h-for-basename-signat.patch | 13 +++++--------
.../wayland/{weston_13.0.0.bb => weston_13.0.1.bb} | 2 +-
2 files changed, 6 insertions(+), 9 deletions(-)
rename meta/recipes-graphics/wayland/{weston_13.0.0.bb => weston_13.0.1.bb} (98%)meta/recipes-graphics/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch +5 -8
@@ -1,4 +1,4 @@ -From 2b53236ac637dfa7fb0f438f7391a73f6ef92a06 Mon Sep 17 00:00:00 2001 +From e050830898ea37d30ef1c5339cb1665bdb92dcdc Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 14 Dec 2023 09:13:54 -0800 Subject: [PATCH] libweston,tools: Include libgen.h for basename signature
@@ -20,7 +20,7 @@ Signed-off-by: Khem Raj <[email protected]> 2 files changed, 2 insertions(+) diff --git a/libweston/backend-drm/libbacklight.c b/libweston/backend-drm/libbacklight.c -index ca7f2d68..74690fa7 100644 +index ca7f2d6..74690fa 100644 --- a/libweston/backend-drm/libbacklight.c +++ b/libweston/backend-drm/libbacklight.c @@ -41,6 +41,7 @@
@@ -30,19 +30,16 @@ index ca7f2d68..74690fa7 100644 +#include <libgen.h> #include <string.h> #include <errno.h> - + diff --git a/tools/zunitc/src/zunitc_impl.c b/tools/zunitc/src/zunitc_impl.c -index 18f03015..9b460fa0 100644 +index 18f0301..9b460fa 100644 --- a/tools/zunitc/src/zunitc_impl.c +++ b/tools/zunitc/src/zunitc_impl.c @@ -27,6 +27,7 @@ - + #include <errno.h> #include <fcntl.h> +#include <libgen.h> #include <stdarg.h> #include <stdbool.h> #include <stdio.h> --- -2.43.0 -
meta/recipes-graphics/wayland/weston_13.0.1.bb renamed from meta/recipes-graphics/wayland/weston_13.0.0.bb +1 -1
@@ -14,7 +14,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo file://systemd-notify.weston-start \ " -SRC_URI[sha256sum] = "52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a" +SRC_URI[sha256sum] = "ea1566ab4f5ffce7e9fd4f7a1fca5b30caae4d50023bf459213994094e02b29a" UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags" UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
Signature · 1 line
2.34.1
PATCH 7/37 python3-idna: upgrade 3.6 -> 3.7
In reply to Steve SakomanFrom: Soumya Sambu <[email protected]>
License-Update: Updated copyright year
Changelog:
==========
* Fix issue where specially crafted inputs to encode() could take exceptionally
long amount of time to process. [CVE-2024-3651]
---
.../python/{python3-idna_3.6.bb => python3-idna_3.7.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-idna_3.6.bb => python3-idna_3.7.bb} (62%)meta/recipes-devtools/python/python3-idna_3.7.bb renamed from meta/recipes-devtools/python/python3-idna_3.6.bb +2 -2
@@ -1,9 +1,9 @@ SUMMARY = "Internationalised Domain Names in Applications" HOMEPAGE = "https://github.com/kjd/idna" LICENSE = "BSD-3-Clause & Python-2.0 & Unicode-TOU" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=dbec47b98e1469f6a104c82ff9698cee" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=204c0612e40a4dd46012a78d02c80fb1" -SRC_URI[sha256sum] = "9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca" +SRC_URI[sha256sum] = "028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc" inherit pypi python_flit_core
Signature · 1 line
2.34.1
PATCH 8/37 oeqa/runtime: make minidebuginfo test work with coreutils
In reply to Steve SakomanFrom: Etienne Cordonnier <[email protected]>
The test was failing with core-image-full-cmdline which uses sleep from coreutils instead of sleep from busybox.
--- meta/lib/oeqa/runtime/cases/systemd.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/lib/oeqa/runtime/cases/systemd.py +2 -1
@@ -157,7 +157,8 @@ class SystemdServiceTests(SystemdTest): (status, output) = self.target.run('coredumpctl info') self.assertEqual(status, 0, msg='MiniDebugInfo Test failed: %s' % output) - self.assertEqual('sleep_for_duration (busybox.nosuid' in output, True, msg='Call stack is missing minidebuginfo symbols (functions shown as "n/a"): %s' % output) + self.assertEqual('sleep_for_duration (busybox.nosuid' in output or 'xnanosleep (sleep.coreutils' in output, + True, msg='Call stack is missing minidebuginfo symbols (functions shown as "n/a"): %s' % output) class SystemdJournalTests(SystemdTest):
Signature · 1 line
2.34.1
PATCH 10/37 multilib.bbclass: replace deprecated e.data with d
In reply to Steve SakomanFrom: Kai Kang <[email protected]>
Replace deprecated e.data with d in multilib.bbclass and multilib_global.bbclass.
Remove event check in function multilib_virtclass_handler_vendor in multilib_global.bbclass. The function flag 'eventmask' has been set with 'bb.event.ConfigParsed', so no need to check the event any more.
--- meta/classes/multilib.bbclass | 87 ++++++++++++++-------------- meta/classes/multilib_global.bbclass | 25 ++++---- 2 files changed, 56 insertions(+), 56 deletions(-)
meta/classes/multilib.bbclass +44 -43
@@ -5,30 +5,30 @@ # python multilib_virtclass_handler () { - cls = e.data.getVar("BBEXTENDCURR") - variant = e.data.getVar("BBEXTENDVARIANT") + cls = d.getVar("BBEXTENDCURR") + variant = d.getVar("BBEXTENDVARIANT") if cls != "multilib" or not variant: return - localdata = bb.data.createCopy(e.data) + localdata = bb.data.createCopy(d) localdata.delVar('TMPDIR') - e.data.setVar('STAGING_KERNEL_DIR', localdata.getVar('STAGING_KERNEL_DIR')) + d.setVar('STAGING_KERNEL_DIR', localdata.getVar('STAGING_KERNEL_DIR')) # There should only be one kernel in multilib configs # We also skip multilib setup for module packages. - provides = (e.data.getVar("PROVIDES") or "").split() + provides = (d.getVar("PROVIDES") or "").split() non_ml_recipes = d.getVar('NON_MULTILIB_RECIPES').split() - bpn = e.data.getVar("BPN") - if "virtual/kernel" in provides or \ - bb.data.inherits_class('module-base', e.data) or \ - bpn in non_ml_recipes: + bpn = d.getVar("BPN") + if ("virtual/kernel" in provides + or bb.data.inherits_class('module-base', d) + or bpn in non_ml_recipes): raise bb.parse.SkipRecipe("We shouldn't have multilib variants for %s" % bpn) - save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME") or "" + save_var_name = d.getVar("MULTILIB_SAVE_VARNAME") or "" for name in save_var_name.split(): - val=e.data.getVar(name) + val = d.getVar(name) if val: - e.data.setVar(name + "_MULTILIB_ORIGINAL", val) + d.setVar(name + "_MULTILIB_ORIGINAL", val) # We nearly don't need this but dependencies on NON_MULTILIB_RECIPES don't work without it d.setVar("SSTATE_ARCHS_TUNEPKG", "${@all_multilib_tune_values(d, 'TUNE_PKGARCH')}")
@@ -36,66 +36,67 @@ python multilib_virtclass_handler () { overrides = e.data.getVar("OVERRIDES", False) pn = e.data.getVar("PN", False) overrides = overrides.replace("pn-${PN}", "pn-${PN}:pn-" + pn) - e.data.setVar("OVERRIDES", overrides) + d.setVar("OVERRIDES", overrides) - if bb.data.inherits_class('image', e.data): - e.data.setVar("MLPREFIX", variant + "-") - e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) - e.data.setVar('SDKTARGETSYSROOT', e.data.getVar('SDKTARGETSYSROOT')) + if bb.data.inherits_class('image', d): + d.setVar("MLPREFIX", variant + "-") + d.setVar("PN", variant + "-" + d.getVar("PN", False)) + d.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT')) override = ":virtclass-multilib-" + variant - e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) - target_vendor = e.data.getVar("TARGET_VENDOR:" + "virtclass-multilib-" + variant, False) + d.setVar("OVERRIDES", d.getVar("OVERRIDES", False) + override) + target_vendor = d.getVar("TARGET_VENDOR:" + "virtclass-multilib-" + variant, False) if target_vendor: - e.data.setVar("TARGET_VENDOR", target_vendor) + d.setVar("TARGET_VENDOR", target_vendor) return - if bb.data.inherits_class('cross-canadian', e.data): + if bb.data.inherits_class('cross-canadian', d): # Multilib cross-candian should use the same nativesdk sysroot without MLPREFIX - e.data.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot") - e.data.setVar("STAGING_DIR_TARGET", "${WORKDIR}/recipe-sysroot") - e.data.setVar("STAGING_DIR_HOST", "${WORKDIR}/recipe-sysroot") - e.data.setVar("RECIPE_SYSROOT_MANIFEST_SUBDIR", "nativesdk-" + variant) - e.data.setVar("MLPREFIX", variant + "-") + d.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot") + d.setVar("STAGING_DIR_TARGET", "${WORKDIR}/recipe-sysroot") + d.setVar("STAGING_DIR_HOST", "${WORKDIR}/recipe-sysroot") + d.setVar("RECIPE_SYSROOT_MANIFEST_SUBDIR", "nativesdk-" + variant) + d.setVar("MLPREFIX", variant + "-") override = ":virtclass-multilib-" + variant - e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) + d.setVar("OVERRIDES", d.getVar("OVERRIDES", False) + override) return - if bb.data.inherits_class('native', e.data): + if bb.data.inherits_class('native', d): raise bb.parse.SkipRecipe("We can't extend native recipes") - if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data): + if bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('crosssdk', d): raise bb.parse.SkipRecipe("We can't extend nativesdk recipes") - if bb.data.inherits_class('allarch', e.data) and not d.getVar('MULTILIB_VARIANTS') \ - and not bb.data.inherits_class('packagegroup', e.data): + if (bb.data.inherits_class('allarch', d) + and not d.getVar('MULTILIB_VARIANTS') + and not bb.data.inherits_class('packagegroup', d)): raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups") # Expand this since this won't work correctly once we set a multilib into place - e.data.setVar("ALL_MULTILIB_PACKAGE_ARCHS", e.data.getVar("ALL_MULTILIB_PACKAGE_ARCHS")) + d.setVar("ALL_MULTILIB_PACKAGE_ARCHS", d.getVar("ALL_MULTILIB_PACKAGE_ARCHS")) override = ":virtclass-multilib-" + variant - skip_msg = e.data.getVarFlag('SKIP_RECIPE', e.data.getVar('PN')) + skip_msg = d.getVarFlag('SKIP_RECIPE', d.getVar('PN')) if skip_msg: - pn_new = variant + "-" + e.data.getVar('PN') - if not e.data.getVarFlag('SKIP_RECIPE', pn_new): - e.data.setVarFlag('SKIP_RECIPE', pn_new, skip_msg) + pn_new = variant + "-" + d.getVar('PN') + if not d.getVarFlag('SKIP_RECIPE', pn_new): + d.setVarFlag('SKIP_RECIPE', pn_new, skip_msg) - e.data.setVar("MLPREFIX", variant + "-") - e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) - e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) + d.setVar("MLPREFIX", variant + "-") + d.setVar("PN", variant + "-" + d.getVar("PN", False)) + d.setVar("OVERRIDES", d.getVar("OVERRIDES", False) + override) # Expand INCOMPATIBLE_LICENSE_EXCEPTIONS with multilib prefix - pkgs = e.data.getVar("INCOMPATIBLE_LICENSE_EXCEPTIONS") + pkgs = d.getVar("INCOMPATIBLE_LICENSE_EXCEPTIONS") if pkgs: for pkg in pkgs.split(): pkgs += " " + variant + "-" + pkg - e.data.setVar("INCOMPATIBLE_LICENSE_EXCEPTIONS", pkgs) + d.setVar("INCOMPATIBLE_LICENSE_EXCEPTIONS", pkgs) # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data - newtune = e.data.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + variant, False) + newtune = d.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + variant, False) if newtune: - e.data.setVar("DEFAULTTUNE", newtune) + d.setVar("DEFAULTTUNE", newtune) } addhandler multilib_virtclass_handler
meta/classes/multilib_global.bbclass +12 -13
@@ -171,24 +171,23 @@ def preferred_ml_updates(d): d.appendVar("SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS", " " + " ".join(extras)) python multilib_virtclass_handler_vendor () { - if isinstance(e, bb.event.ConfigParsed): - for v in e.data.getVar("MULTILIB_VARIANTS").split(): - if e.data.getVar("TARGET_VENDOR:virtclass-multilib-" + v, False) is None: - e.data.setVar("TARGET_VENDOR:virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v) - preferred_ml_updates(e.data) + for v in d.getVar("MULTILIB_VARIANTS").split(): + if d.getVar("TARGET_VENDOR:virtclass-multilib-" + v, False) is None: + d.setVar("TARGET_VENDOR:virtclass-multilib-" + v, d.getVar("TARGET_VENDOR", False) + "ml" + v) + preferred_ml_updates(d) } addhandler multilib_virtclass_handler_vendor multilib_virtclass_handler_vendor[eventmask] = "bb.event.ConfigParsed" python multilib_virtclass_handler_global () { - variant = e.data.getVar("BBEXTENDVARIANT") + variant = d.getVar("BBEXTENDVARIANT") if variant: return non_ml_recipes = d.getVar('NON_MULTILIB_RECIPES').split() - if bb.data.inherits_class('kernel', e.data) or \ - bb.data.inherits_class('module-base', e.data) or \ + if bb.data.inherits_class('kernel', d) or \ + bb.data.inherits_class('module-base', d) or \ d.getVar('BPN') in non_ml_recipes: # We need to avoid expanding KERNEL_VERSION which we can do by deleting it
@@ -197,7 +196,7 @@ python multilib_virtclass_handler_global () { localdata.delVar("KERNEL_VERSION") localdata.delVar("KERNEL_VERSION_PKG_NAME") - variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split() + variants = (d.getVar("MULTILIB_VARIANTS") or "").split() import oe.classextend clsextends = []
@@ -208,22 +207,22 @@ python multilib_virtclass_handler_global () { origprovs = provs = localdata.getVar("PROVIDES") or "" for clsextend in clsextends: provs = provs + " " + clsextend.map_variable("PROVIDES", setvar=False) - e.data.setVar("PROVIDES", provs) + d.setVar("PROVIDES", provs) # Process RPROVIDES origrprovs = rprovs = localdata.getVar("RPROVIDES") or "" for clsextend in clsextends: rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES", setvar=False) if rprovs.strip(): - e.data.setVar("RPROVIDES", rprovs) + d.setVar("RPROVIDES", rprovs) # Process RPROVIDES:${PN}... - for pkg in (e.data.getVar("PACKAGES") or "").split(): + for pkg in (d.getVar("PACKAGES") or "").split(): origrprovs = rprovs = localdata.getVar("RPROVIDES:%s" % pkg) or "" for clsextend in clsextends: rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES:%s" % pkg, setvar=False) rprovs = rprovs + " " + clsextend.extname + "-" + pkg - e.data.setVar("RPROVIDES:%s" % pkg, rprovs) + d.setVar("RPROVIDES:%s" % pkg, rprovs) } addhandler multilib_virtclass_handler_global
Signature · 1 line
2.34.1
PATCH 13/37 cmake-qemu.bbclass: fix if criterion
In reply to Steve SakomanFrom: Kai Kang <[email protected]>
It always executes the scripts whether 'qemu-usermode' in 'MACHINE_FEATURES' or not. Fix the criterion to make it work.
--- meta/classes-recipe/cmake-qemu.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-recipe/cmake-qemu.bbclass +1 -1
@@ -19,7 +19,7 @@ inherit qemu cmake DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}" cmake_do_generate_toolchain_file:append:class-target() { - if [ "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'True', 'False', d)}" ]; then + if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then # Write out a qemu wrapper that will be used as exe_wrapper so that cmake # can run target helper binaries through that. This also allows to execute ctest. qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}"
Signature · 1 line
2.34.1
PATCH 14/37 iptables: fix save/restore symlinks with libnftnl PACKAGECONFIG enabled
In reply to Steve SakomanFrom: Kirill Yatsenko <[email protected]>
When the libnftnl PACKAGECONFIG is enabled, the "iptables" symlink is correctly points to xtables-nft-multi, however the "iptables-save" and "iptables-restore" are still point to the xtables-legacy-multi.
So, when the "iptables" command is used it's using the nftables backend where is the "iptables-save/restore" are using the legacy backend.
This is not consistent with other distros (e.g. Ubuntu).
The issue was identified when testing the UFW firewall with nftables backend.
--- meta/recipes-extended/iptables/iptables_1.8.10.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-extended/iptables/iptables_1.8.10.bb +2 -0
@@ -75,6 +75,8 @@ do_install:append() { # if libnftnl is included, make the iptables symlink point to the nft-based binary by default if ${@bb.utils.contains('PACKAGECONFIG', 'libnftnl', 'true', 'false', d)} ; then ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables + ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables-save + ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables-restore fi }
Signature · 1 line
2.34.1
PATCH 9/37 wic: bootimg-efi: fix error handling
In reply to Steve SakomanFrom: Enrico Jörns <[email protected]>
If we check for empty variables, it does not make sense to print their content in case they are empty.
Additionally, the error message in the 'kernel' check attempted to print the wrong variable ('target') which was not even defined, yet.
Also, raising WicError doesn't require an extra newline.
--- scripts/lib/wic/plugins/source/bootimg-efi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/lib/wic/plugins/source/bootimg-efi.py +2 -2
@@ -428,10 +428,10 @@ class BootimgEFIPlugin(SourcePlugin): elif source_params['loader'] == 'uefi-kernel': kernel = get_bitbake_var("KERNEL_IMAGETYPE") if not kernel: - raise WicError("Empty KERNEL_IMAGETYPE %s\n" % target) + raise WicError("Empty KERNEL_IMAGETYPE") target = get_bitbake_var("TARGET_SYS") if not target: - raise WicError("Unknown arch (TARGET_SYS) %s\n" % target) + raise WicError("Empty TARGET_SYS") if re.match("x86_64", target): kernel_efi_image = "bootx64.efi"
Signature · 1 line
2.34.1
PATCH 11/37 gawk: update patch status
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
--- .../gawk/gawk/0001-m4-readline-add-missing-includes.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch +1 -1
@@ -14,7 +14,7 @@ conftest.c:146:14: error: implicit declaration of function 'open'; did you mean Add the missing includes so that the check doesn't always fail due to these errors. -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-gawk/2024-05/msg00000.html] +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gawk.git/commit/?id=c1613c310d71b87f509458e0259ecd10eda2b140] Signed-off-by: Ross Burton <[email protected]> --- m4/readline.m4 | 2 ++
Signature · 1 line
2.34.1
PATCH 12/37 maintainers.inc: update self e-mail address
In reply to Steve SakomanFrom: Michael Opdenacker <[email protected]>
--- meta/conf/distro/include/maintainers.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
meta/conf/distro/include/maintainers.inc +11 -11
@@ -31,13 +31,13 @@ RECIPE_MAINTAINER:pn-acl = "Chen Qi <[email protected]>" RECIPE_MAINTAINER:pn-acpica = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-acpid = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-adwaita-icon-theme = "Ross Burton <[email protected]>" -RECIPE_MAINTAINER:pn-alsa-lib = "Michael Opdenacker <[email protected]>" -RECIPE_MAINTAINER:pn-alsa-plugins = "Michael Opdenacker <[email protected]>" -RECIPE_MAINTAINER:pn-alsa-state = "Michael Opdenacker <[email protected]>" -RECIPE_MAINTAINER:pn-alsa-tools = "Michael Opdenacker <[email protected]>" -RECIPE_MAINTAINER:pn-alsa-topology-conf = "Michael Opdenacker <[email protected]>" -RECIPE_MAINTAINER:pn-alsa-ucm-conf = "Michael Opdenacker <[email protected]>" -RECIPE_MAINTAINER:pn-alsa-utils = "Michael Opdenacker <[email protected]>" +RECIPE_MAINTAINER:pn-alsa-lib = "Michael Opdenacker <[email protected]>" +RECIPE_MAINTAINER:pn-alsa-plugins = "Michael Opdenacker <[email protected]>" +RECIPE_MAINTAINER:pn-alsa-state = "Michael Opdenacker <[email protected]>" +RECIPE_MAINTAINER:pn-alsa-tools = "Michael Opdenacker <[email protected]>" +RECIPE_MAINTAINER:pn-alsa-topology-conf = "Michael Opdenacker <[email protected]>" +RECIPE_MAINTAINER:pn-alsa-ucm-conf = "Michael Opdenacker <[email protected]>" +RECIPE_MAINTAINER:pn-alsa-utils = "Michael Opdenacker <[email protected]>" RECIPE_MAINTAINER:pn-appstream = "Markus Volk <[email protected]>" RECIPE_MAINTAINER:pn-apr = "Hongxu Jia <[email protected]>" RECIPE_MAINTAINER:pn-apr-util = "Hongxu Jia <[email protected]>"
@@ -174,7 +174,7 @@ RECIPE_MAINTAINER:pn-expect = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-ffmpeg = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-file = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-findutils = "Chen Qi <[email protected]>" -RECIPE_MAINTAINER:pn-flac = "Michael Opdenacker <[email protected]>" +RECIPE_MAINTAINER:pn-flac = "Michael Opdenacker <[email protected]>" RECIPE_MAINTAINER:pn-flex = "Chen Qi <[email protected]>" RECIPE_MAINTAINER:pn-font-alias = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-font-util = "Unassigned <[email protected]>"
@@ -301,7 +301,7 @@ RECIPE_MAINTAINER:pn-keymaps = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER:pn-kmod = "Chen Qi <[email protected]>" RECIPE_MAINTAINER:pn-kmscube = "Carlos Rafael Giani <[email protected]>" RECIPE_MAINTAINER:pn-l3afpad = "Anuj Mittal <[email protected]>" -RECIPE_MAINTAINER:pn-lame = "Michael Opdenacker <[email protected]>" +RECIPE_MAINTAINER:pn-lame = "Michael Opdenacker <[email protected]>" RECIPE_MAINTAINER:pn-ldconfig-native = "Khem Raj <[email protected]>" RECIPE_MAINTAINER:pn-less = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-liba52 = "Unassigned <[email protected]>"
@@ -776,8 +776,8 @@ RECIPE_MAINTAINER:pn-shutdown-desktop = "Alexander Kanavin <[email protected] RECIPE_MAINTAINER:pn-signing-keys = "Richard Purdie <[email protected]>" RECIPE_MAINTAINER:pn-slang = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-socat = "Hongxu Jia <[email protected]>" -RECIPE_MAINTAINER:pn-speex = "Michael Opdenacker <[email protected]>" -RECIPE_MAINTAINER:pn-speexdsp = "Michael Opdenacker <[email protected]>" +RECIPE_MAINTAINER:pn-speex = "Michael Opdenacker <[email protected]>" +RECIPE_MAINTAINER:pn-speexdsp = "Michael Opdenacker <[email protected]>" RECIPE_MAINTAINER:pn-spirv-headers = "Jose Quaresma <[email protected]>" RECIPE_MAINTAINER:pn-spirv-tools = "Jose Quaresma <[email protected]>" RECIPE_MAINTAINER:pn-sqlite3 = "Anuj Mittal <[email protected]>"
Signature · 1 line
2.34.1
PATCH 15/37 selftest: add Upstream-Status to .patch files
In reply to Steve SakomanFrom: Martin Jansa <[email protected]>
--- .../recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch | 2 +- .../devtool/devtool-patch-overrides/qemuarm/arm.patch | 2 ++ .../devtool/devtool-patch-overrides/qemux86/x86.patch | 2 ++ .../devtool/devtool-test-ignored/devtool-test-ignored.patch | 2 ++ .../devtool-test-ignored/devtool-test-ignored.patch.expected | 1 + ...1-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch | 2 ++ ...tch-you-only-if-devtool-lets-me-to-do-it-corr.patch.expected | 1 + .../0001-Add-a-note-line-to-the-quick-reference.patch | 2 ++ .../devtool/devtool-upgrade-test1-1.5.3/backported.patch | 2 ++ .../recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch | 2 ++ .../recipes-test/man-db/files/0001-Test-patch-here.patch | 2 ++ meta-selftest/recipes-test/recipetool/files/add-file.patch | 2 ++ 12 files changed, 21 insertions(+), 1 deletion(-)
meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch +1 -1
@@ -4,7 +4,7 @@ Date: Wed, 27 Dec 2023 09:55:48 +0000 Subject: [PATCH] Greet "OE-Core" Signed-off-by: Alex Kiernan <[email protected]> -Upstream-Status: Inappropriate +Upstream-Status: Inappropriate [Test artefact] --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [Test artefact] + --- source.orig 2020-10-06 13:26:10.792688630 +0100 +++ source 2020-10-06 13:26:18.853424694 +0100 @@ -1 +1 @@
meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [Test artefact] + --- source.orig 2020-10-06 13:26:10.792688630 +0100 +++ source 2020-10-06 13:26:18.853424694 +0100 @@ -1 +1 @@
meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [Test artefact] + diff --git a/ignored b/ignored index a579759..e3d7b43 100644 --- a/ignored
meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch.expected +1 -0
@@ -3,6 +3,7 @@ From: Martin Jansa <[email protected]> Date: Thu, 28 May 2020 01:32:31 +0200 Subject: [PATCH] meta-selftest: add test of .gitignore in tarball +Upstream-Status: Inappropriate [Test artefact] --- ignored | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [Test artefact] + diff --git a/patch-me b/patch-me index a20b29a..5e35d1b 100644 --- a/patch-me
meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch.expected +1 -0
@@ -3,6 +3,7 @@ From: Martin Jansa <[email protected]> Date: Thu, 28 May 2020 02:03:39 +0200 Subject: [PATCH] meta-selftest: add test for .patch file with long filename +Upstream-Status: Inappropriate [Test artefact] --- patch-me | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/0001-Add-a-note-line-to-the-quick-reference.patch +2 -0
@@ -4,6 +4,8 @@ Date: Wed, 24 Feb 2016 17:43:03 +1300 Subject: [PATCH] Add a note line to the quick reference A test patch so we have a file to move around. + +Upstream-Status: Inappropriate [Test artefact] --- doc/quickref.1.in | 1 + 1 file changed, 1 insertion(+)
meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/backported.patch +2 -0
@@ -4,6 +4,8 @@ Date: Mon Nov 18 18:43:15 2019 +0100 Backport of the NEWS file from version 1.6.0 +Upstream-Status: Inappropriate [Test artefact] + diff --git a/doc/NEWS b/doc/NEWS index 69793fc..fd49b1c 100644 --- a/doc/NEWS
meta-selftest/recipes-test/gitrepotest/gitrepotest/0001-testpatch.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [Test artefact] + diff --git a/Makefile.am b/Makefile.am index 432a9b4..bbf7c74 100644 --- a/Makefile.am
meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch +2 -0
@@ -4,6 +4,8 @@ Date: Fri, 9 Feb 2018 17:37:48 +0200 Subject: [PATCH] Test patch here! This is an invalid patch used by oe-selftest + +Upstream-Status: Inappropriate [Test artefact] --- README | 1 + 1 file changed, 1 insertion(+)
meta-selftest/recipes-test/recipetool/files/add-file.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [Test artefact] + diff --git a/file2 b/file2 new file mode 100644 index 0000000..049b42e
Signature · 1 line
2.34.1
PATCH 16/37 grub,grub-efi: Remove -mfpmath=sse on x86
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
This option fails with clang compiler when testing for soft-float because OE enforces this option via CCARGS however, gtub's makefile/configure does disable all sse options when checking for soft-float support, but it can not disable -mfpmath=sse as its inserted by OE, therefore remove it in recipe
Fixes build errors seen with clang/musl like on x86
error: the 'sse' unit is not supported with this instruction set
--- meta/recipes-bsp/grub/grub2.inc | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-bsp/grub/grub2.inc +4 -0
@@ -52,6 +52,10 @@ GRUBPLATFORM ??= "pc" inherit autotools gettext texinfo pkgconfig CFLAGS:remove = "-O2" +# It doesn't support sse, its make.defaults sets: +# CFLAGS += -mno-mmx -mno-sse +# So also remove -mfpmath=sse from TUNE_CCARGS +TUNE_CCARGS:remove = "-mfpmath=sse" EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} \ --disable-grub-mkfont \
Signature · 1 line
2.34.1
PATCH 17/37 python3: Treat UID/GID overflow as failure
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
This fixes ptest failures on 32bit architectures
AssertionError:
Failed ptests:
{'python3': ['test_extractall_none_gid',
'test_extractall_none_gname',
'test_extractall_none_mode',
'test_extractall_none_mtime',
'test_extractall_none_uid',
'test_extractall_none_uname',
'setUpClass',
'python3']}--- ...e-treat-overflow-in-UID-GID-as-failu.patch | 40 +++++++++++++++++++ .../recipes-devtools/python/python3_3.12.4.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch
meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 999d4e74d34afa233ad8ad0c70b989d77a21957f Mon Sep 17 00:00:00 2001 +From: Petr Viktorin <[email protected]> +Date: Wed, 23 Aug 2023 20:00:07 +0200 +Subject: [PATCH] gh-107811: tarfile: treat overflow in UID/GID as failure to + set it (#108369) + +Upstream-Status: Backport [https://github.com/python/cpython/pull/108369] +Signed-off-by: Khem Raj <[email protected]> +--- + Lib/tarfile.py | 3 ++- + .../Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) + create mode 100644 Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst + +diff --git a/Lib/tarfile.py b/Lib/tarfile.py +index 3bbbcaa..473167d 100755 +--- a/Lib/tarfile.py ++++ b/Lib/tarfile.py +@@ -2557,7 +2557,8 @@ class TarFile(object): + os.lchown(targetpath, u, g) + else: + os.chown(targetpath, u, g) +- except OSError as e: ++ except (OSError, OverflowError) as e: ++ # OverflowError can be raised if an ID doesn't fit in `id_t` + raise ExtractError("could not change owner") from e + + def chmod(self, tarinfo, targetpath): +diff --git a/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst b/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst +new file mode 100644 +index 0000000..ffca413 +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst +@@ -0,0 +1,3 @@ ++:mod:`tarfile`: extraction of members with overly large UID or GID (e.g. on ++an OS with 32-bit :c:type:`!id_t`) now fails in the same way as failing to ++set the ID. +-- +2.45.0 +
meta/recipes-devtools/python/python3_3.12.4.bb +1 -0
@@ -31,6 +31,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-test_storlines-skip-due-to-load-variability.patch \ file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \ file://0001-test_shutdown-skip-problematic-test.patch \ + file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ " SRC_URI:append:class-native = " \
Signature · 1 line
2.34.1
PATCH 18/37 python3: skip test_concurrent_futures/test_deadlock
In reply to Steve SakomanFrom: Trevor Gamblin <[email protected]>
These tests are causing hangs on the Autobuilder, so disable them for now.
--- ...-test_deadlock-skip-problematic-test.patch | 30 +++++++++++++++++++ .../recipes-devtools/python/python3_3.12.4.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch
meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch new file +30 -0
@@ -0,0 +1,30 @@ +From d7e3f26e7094fbe20e2271d75f18ac3b23a67f58 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <[email protected]> +Date: Wed, 12 Jun 2024 10:29:03 -0400 +Subject: [PATCH] test_deadlock: skip problematic test + +This test hangs frequently when run on the Autobuilder. Disable it in +testing until the cause can be determined. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Trevor Gamblin <[email protected]> +--- + Lib/test/test_concurrent_futures/test_deadlock.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Lib/test/test_concurrent_futures/test_deadlock.py b/Lib/test/test_concurrent_futures/test_deadlock.py +index 1db4cd0099..fd07895a17 100644 +--- a/Lib/test/test_concurrent_futures/test_deadlock.py ++++ b/Lib/test/test_concurrent_futures/test_deadlock.py +@@ -90,6 +90,7 @@ def __reduce__(self): + return _raise_error_ignore_stderr, (UnpicklingError, ) + + [email protected]("skipping problematic test") + class ExecutorDeadlockTest: + TIMEOUT = support.LONG_TIMEOUT + +-- +2.45.2 +
meta/recipes-devtools/python/python3_3.12.4.bb +1 -0
@@ -32,6 +32,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \ file://0001-test_shutdown-skip-problematic-test.patch \ file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ + file://0001-test_deadlock-skip-problematic-test.patch \ " SRC_URI:append:class-native = " \
Signature · 1 line
2.34.1
PATCH 19/37 python3: skip test_multiprocessing/test_active_children test
In reply to Steve SakomanFrom: Trevor Gamblin <[email protected]>
This test is causing problems on the Autobuilder, so disable it for now.
--- ...ctive_children-skip-problematic-test.patch | 30 +++++++++++++++++++ .../recipes-devtools/python/python3_3.12.4.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch
meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch new file +30 -0
@@ -0,0 +1,30 @@ +From bf3eb28bba24509a3e1cd40f1f0e26db833779a2 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <[email protected]> +Date: Thu, 13 Jun 2024 10:54:31 -0400 +Subject: [PATCH] test_active_children: skip problematic test + +This test is failing in some tests on the Autobuilder. Since it's of a +similar nature to other failing/hanging tests, disable it for now. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Trevor Gamblin <[email protected]> +--- + Lib/test/_test_multiprocessing.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py +index 3955123455..a1861fa3a0 100644 +--- a/Lib/test/_test_multiprocessing.py ++++ b/Lib/test/_test_multiprocessing.py +@@ -579,6 +579,7 @@ def test_cpu_count(self): + self.assertTrue(type(cpus) is int) + self.assertTrue(cpus >= 1) + ++ @unittest.skip("skipping problematic test") + def test_active_children(self): + self.assertEqual(type(self.active_children()), list) + +-- +2.45.2 +
meta/recipes-devtools/python/python3_3.12.4.bb +1 -0
@@ -33,6 +33,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-test_shutdown-skip-problematic-test.patch \ file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ file://0001-test_deadlock-skip-problematic-test.patch \ + file://0001-test_active_children-skip-problematic-test.patch \ " SRC_URI:append:class-native = " \
Signature · 1 line
2.34.1
PATCH 20/37 oeqa/sdk/case: Ensure DL_DIR is populated with artefacts if used
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
Where we're using DL_DIR in sdk archive to try and cache testing artefacts, copy into the cache so that it gets populated and this doesn't have to be done manually. Currently we're making a lot of repeat requests to github as this wasn't being populated.
--- meta/lib/oeqa/sdk/case.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
meta/lib/oeqa/sdk/case.py +6 -3
@@ -6,6 +6,7 @@ import os import subprocess +import shutil from oeqa.core.case import OETestCase
@@ -21,12 +22,14 @@ class OESDKTestCase(OETestCase): archive = os.path.basename(urlparse(url).path) if dl_dir: - tarball = os.path.join(dl_dir, archive) - if os.path.exists(tarball): - return tarball + archive_tarball = os.path.join(dl_dir, archive) + if os.path.exists(archive_tarball): + return archive_tarball tarball = os.path.join(workdir, archive) subprocess.check_output(["wget", "-O", tarball, url], stderr=subprocess.STDOUT) + if dl_dir and not os.path.exists(archive_tarball): + shutil.copyfile(tarball, archive_tarball) return tarball def check_elf(self, path, target_os=None, target_arch=None):
Signature · 1 line
2.34.1
PATCH 21/37 gawk: Remove References to /usr/local/bin/gawk
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
Also replace the hashbangs using /bin/gawk to use
${bindir}/gawk
This fixes issues such as
https://github.com/riscv/meta-riscv/issues/384
--- meta/recipes-extended/gawk/gawk_5.3.0.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-extended/gawk/gawk_5.3.0.bb +2 -0
@@ -52,6 +52,8 @@ do_install_ptest() { cp ${S}/test/$i* ${D}${PTEST_PATH}/test done sed -i \ + -e 's|#! /bin/gawk|#! ${bindir}/gawk|g' \ + -e 's|#! /usr/local/bin/gawk|#! ${bindir}/gawk|g' \ -e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/test/*.awk sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests
Signature · 1 line
2.34.1
PATCH 22/37 archiver.bbclass: Fix work-shared checking for kernel recipes
In reply to Steve SakomanFrom: Benjamin Szőke <[email protected]>
Source dir can be a symbolic link in some BSP's linux kernel recipe which points to work-shared path (like linux-fslc in meta-freescale). Change to use os.path.realpath() in order to get real path of source dir.
--- meta/classes/archiver.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/classes/archiver.bbclass +2 -1
@@ -473,7 +473,8 @@ def create_diff_gz(d, src_orig, src, ar_outdir): def is_work_shared(d): sharedworkdir = os.path.join(d.getVar('TMPDIR'), 'work-shared') - return d.getVar('S').startswith(sharedworkdir) + sourcedir = os.path.realpath(d.getVar('S')) + return sourcedir.startswith(sharedworkdir) # Run do_unpack and do_patch python do_unpack_and_patch() {
Signature · 1 line
2.34.1
PATCH 23/37 classes/kernel: No symlink in postinst without KERNEL_IMAGETYPE_SYMLINK
In reply to Steve SakomanFrom: Jörg Sommer <[email protected]>
The commit “Use a copy of image for kernel*.rpm if fs doesn't support symlinks” [1] added postinst and postrm scripts to the kernel package which create a symlink after package installation. This should not happen if KERNEL_IMAGETYPE_SYMLINK is not 1.
Background: The u-boot implementation of jffs2 does not support symlinks. Using a hardlink or removing ${KERNEL_VERSION} from the file name fails, because the current postinst script replaces the file with the symlink.
[1] 8b6b95106a5d4f1f6d34209ec5c475c900270ecd
--- meta/classes-recipe/kernel.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta/classes-recipe/kernel.bbclass +4 -2
@@ -115,7 +115,9 @@ python __anonymous () { d.setVar('PKG:%s-image-%s' % (kname,typelower), '%s-image-%s-${KERNEL_VERSION_PKG_NAME}' % (kname, typelower)) d.setVar('ALLOW_EMPTY:%s-image-%s' % (kname, typelower), '1') - d.prependVar('pkg_postinst:%s-image-%s' % (kname,typelower), """set +e + + if d.getVar('KERNEL_IMAGETYPE_SYMLINK') == '1': + d.prependVar('pkg_postinst:%s-image-%s' % (kname,typelower), """set +e if [ -n "$D" ]; then ln -sf %s-${KERNEL_VERSION} $D/${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1 else
@@ -127,7 +129,7 @@ else fi set -e """ % (type, type, type, type, type, type, type)) - d.setVar('pkg_postrm:%s-image-%s' % (kname,typelower), """set +e + d.setVar('pkg_postrm:%s-image-%s' % (kname,typelower), """set +e if [ -f "${KERNEL_IMAGEDEST}/%s" -o -L "${KERNEL_IMAGEDEST}/%s" ]; then rm -f ${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1 fi
Signature · 1 line
2.34.1
PATCH 24/37 oeqa/runtime: fix race-condition in minidebuginfo test
In reply to Steve SakomanFrom: Etienne Cordonnier <[email protected]>
Fix this error where 'coredumpctl info' warns that the coredump is still being processed:
``` AssertionError: 1 != 0 : MiniDebugInfo Test failed: No match found. -- Notice: 1 [email protected] unit is running, output may be incomplete. ```
(From OE-Core rev: ad1ce64f5c1f22a7b10025d8cba20dc74354ac81)
--- meta/lib/oeqa/runtime/cases/systemd.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
meta/lib/oeqa/runtime/cases/systemd.py +13 -4
@@ -150,12 +150,21 @@ class SystemdServiceTests(SystemdTest): t_thread.start() time.sleep(1) - status, output = self.target.run('pidof sleep') + status, sleep_pid = self.target.run('pidof sleep') # cause segfault on purpose - self.target.run('kill -SEGV %s' % output) - self.assertEqual(status, 0, msg = 'Not able to find process that runs sleep, output : %s' % output) + self.target.run('kill -SEGV %s' % sleep_pid) + self.assertEqual(status, 0, msg = 'Not able to find process that runs sleep, output : %s' % sleep_pid) - (status, output) = self.target.run('coredumpctl info') + # Give some time to [email protected] to process the coredump + for x in range(20): + status, output = self.target.run('coredumpctl list %s' % sleep_pid) + if status == 0: + break + time.sleep(1) + else: + self.fail("Timed out waiting for coredump creation") + + (status, output) = self.target.run('coredumpctl info %s' % sleep_pid) self.assertEqual(status, 0, msg='MiniDebugInfo Test failed: %s' % output) self.assertEqual('sleep_for_duration (busybox.nosuid' in output or 'xnanosleep (sleep.coreutils' in output, True, msg='Call stack is missing minidebuginfo symbols (functions shown as "n/a"): %s' % output)
Signature · 1 line
2.34.1
PATCH 25/37 python3: submit deterministic_imports.patch upstream as a ticket
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- .../recipes-devtools/python/python3/deterministic_imports.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/python/python3/deterministic_imports.patch +1 -1
@@ -11,7 +11,7 @@ has caused a long string of different issues for us. As a result, patch this to a behaviour which works for us. -Upstream-Status: Pending [need to talk to upstream to see if they'll take one or both fixes] +Upstream-Status: Submitted [https://github.com/python/cpython/issues/120492; need to first talk to upstream to see if they'll take one or both fixes] Signed-off-by: Richard Purdie <[email protected]> ---
Signature · 1 line
2.34.1
PATCH 26/37 glib-networking: submit eagain.patch upstream
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- meta/recipes-core/glib-networking/glib-networking/eagain.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/glib-networking/glib-networking/eagain.patch +1 -1
@@ -12,7 +12,7 @@ FAIL: glib-networking/connection-openssl.test (Child process killed by signal 6) The test should probably retry in this situation so test a patch which does this. -Upstream-Status: Pending [testing to see if patch resolves the issue] +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/253] Signed-off-by: Richard Purdie <[email protected]> ---
Signature · 1 line
2.34.1
PATCH 27/37 glslang: mark 0001-generate-glslang-pkg-config.patch as Inappropriate
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
Issue is already being independently fixed upstream.
--- .../glslang/glslang/0001-generate-glslang-pkg-config.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch +1 -1
@@ -5,7 +5,7 @@ Subject: [PATCH] generate glslang pkg-config Based on https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config-compatibility.patch -Upstream-Status: Pending +Upstream-Status: Inappropriate [independently developed patch submitted at https://github.com/KhronosGroup/glslang/pull/3371] Signed-off-by: Jose Quaresma <[email protected]> ---
Signature · 1 line
2.34.1
PATCH 28/37 tcp-wrappers: mark all patches as inactive-upstream
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- .../tcp-wrappers-7.6/0001-Fix-build-with-clang.patch | 2 +- .../0001-Fix-implicit-function-declaration-warnings.patch | 2 +- .../tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/ldflags.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch | 2 +- meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch | 2 +- .../tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-)
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch +1 -1
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix build with clang Fix "error: non-void function 'fix_options' should return a value". Add function prototype to tcpd.c and miscd.c. -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Oleksiy Obitotskyy <[email protected]> ---
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-implicit-function-declaration-warnings.patch +1 -1
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix implicit-function-declaration warnings These are seen with clang-15+ -Upstream-Status: Inappropriate [upstream is dead] +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Khem Raj <[email protected]> --- hosts_access.c | 3 +++
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Remove-fgets-extern-declaration.patch +1 -1
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove fgets() extern declaration These sources already include <stdio.h> which should bring the correct declaration -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Khem Raj <[email protected]> --- hosts_access.c | 1 -
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 --- tcp_wrappers_7.6.orig/hosts_access.5 1995-01-30 19:51:47.000000000 +0100
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruNp tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3 --- tcp_wrappers_7.6.orig/hosts_access.3 2005-03-09 18:30:25.000000000 +0100
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=17847
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] * Mon Feb 5 2001 Preston Brown <[email protected]> - fix gethostbyname to work better with dot "." notation (#16949)
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/fix_options.c tcp_wrappers_7.6/fix_options.c --- tcp_wrappers_7.6.orig/fix_options.c 1997-04-08 02:29:19.000000000 +0200
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Path: news.porcupine.org!news.porcupine.org!not-for-mail From: Wietse Venema <wietse@((no)(spam)(please))wzv.win.tue.nl>
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -uN tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c --- tcp_wrappers_7.6/hosts_access.c Mon May 20 14:00:56 2002
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Index: tcp_wrappers_7.6/Makefile ===================================================================
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile --- tcp_wrappers_7.6.orig/Makefile 2004-05-02 15:37:59.000000000 +0200
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 --- tcp_wrappers_7.6.orig/hosts_access.5 2003-08-21 03:15:36.000000000 +0200
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5 --- tcp_wrappers_7.6.orig/hosts_access.5 2004-04-25 12:17:59.000000000 +0200
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/eval.c tcp_wrappers_7.6/eval.c --- tcp_wrappers_7.6.orig/eval.c 1995-01-30 19:51:46.000000000 +0100
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings.patch +1 -1
@@ -1,7 +1,7 @@ Compile warning fixes from Debian Signed-off-by: Adrian Bunk <[email protected]> -Upstream-Status: Inappropriate [upstream is dead] +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] --- a/options.c +++ b/options.c
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/fix_warnings2.patch +1 -1
@@ -1,7 +1,7 @@ Compile warning fixes from Debian Signed-off-by: Adrian Bunk <[email protected]> -Upstream-Status: Inappropriate [upstream is dead] +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] --- a/clean_exit.c +++ b/clean_exit.c
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/percent_m.c tcp_wrappers_7.6/percent_m.c --- tcp_wrappers_7.6.orig/percent_m.c 1994-12-28 17:42:37.000000000 +0100
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Index: tcp_wrappers_7.6.orig/Makefile ===================================================================
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch +1 -1
@@ -12,7 +12,7 @@ problem. Also fixed: Fatal error: can't create shared/hosts_access.o: No such file or directory -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Robert Yang <[email protected]> ---
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3 --- tcp_wrappers_7.6.orig/hosts_access.3 2004-04-25 00:10:48.000000000 +0200
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch +1 -1
@@ -1,7 +1,7 @@ __BEGIN_DECLS/__END_DECLS are BSD specific and not defined in musl glibc and uclibc had sys/cdefs.h doing it. -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Khem Raj <[email protected]> Index: tcp_wrappers_7.6/tcpd.h
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch +1 -1
@@ -1,6 +1,6 @@ STRINGS name conflicts with variable for strings tools (e.g. i586-oe-linux-strings) -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: Martin Jansa <[email protected]>
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c --- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:40:08.000000000 +0200
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruNp tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c --- tcp_wrappers_7.6.orig/scaffold.c 2005-03-09 18:22:04.000000000 +0100
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] --- tcp-wrappers-7.6-ipv6.1.orig/safe_finger.c +++ tcp-wrappers-7.6-ipv6.1/safe_finger.c
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] * Mon Feb 10 2003 Harald Hoyer <[email protected]> 7.6-29 - added security patch tcp_wrappers-7.6-sig.patch
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c --- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:42:25.000000000 +0200
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch +1 -1
@@ -7,7 +7,7 @@ Date: Tue Feb 12 09:53:50 2013 -0500 Added support for socklen_t type to len argument passed to socket related calls. This fixes a bug that causes tcp wrappers to fail when using sshd. -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] Signed-off-by: farrah rashid <[email protected]> diff --git a/fix_options.c b/fix_options.c
meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Backport +Upstream-Status: Inactive-Upstream [current release is from 1997; no vcs anywhere] diff -ruN tcp_wrappers_7.6.orig/tcpdchk.c tcp_wrappers_7.6/tcpdchk.c --- tcp_wrappers_7.6.orig/tcpdchk.c 2003-08-21 02:50:37.000000000 +0200
Signature · 1 line
2.34.1
PATCH 29/37 automake: mark new_rt_path_for_test-driver.patch as Inappropriate
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
The patch is specific to how oe-core runs autotools-generated tests:
by cherry-picking needed bits from builddir and srcdir, then hacking Makefile with sed until it runs.
As GNU is not interested in installable tests, they wouldn't be interested in this patch either; and if they become interested, it's probably going to be done in a whole different way.
--- .../automake/automake/new_rt_path_for_test-driver.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch +1 -1
@@ -5,7 +5,7 @@ Subject: [PATCH] Set relative to top_builddir path in Makefile to access test-driver Signed-off-by: Adrian Calianu <[email protected]> -Upstream-Status: Pending +Upstream-Status: Inappropriate [specific to oe-core target ptest installation] Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042 ---
Signature · 1 line
2.34.1
PATCH 30/37 settings-daemon: submit addsoundkeys.patch upstream and update to a revision that has it
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- .../settings-daemon/files/addsoundkeys.patch | 49 ------------------- .../settings-daemon/settings-daemon_0.0.2.bb | 8 +-- 2 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
meta/recipes-sato/settings-daemon/files/addsoundkeys.patch deleted +0 -49
@@ -1,49 +0,0 @@ -Upstream-Status: Pending - -Index: settings-daemon/settings-daemon.c -=================================================================== ---- settings-daemon.orig/settings-daemon.c 2009-05-22 14:57:05.000000000 +0100 -+++ settings-daemon/settings-daemon.c 2009-05-22 14:58:22.000000000 +0100 -@@ -187,6 +187,10 @@ - GCONF_VALUE_STRING, translate_string_string }, - { "/desktop/poky/interface/gtk_color_scheme", "Gtk/ColorScheme", - GCONF_VALUE_STRING, translate_string_string }, -+ { "/desktop/gnome/sound/theme_name", "Net/SoundThemeName", -+ GCONF_VALUE_STRING, translate_string_string }, -+ { "/desktop/gnome/sound/event_sounds", "Net/EnableEventSounds" , -+ GCONF_VALUE_BOOL, translate_bool_int }, - }; - - static const TranslationEntry* -Index: settings-daemon/settings-daemon.schemas -=================================================================== ---- settings-daemon.orig/settings-daemon.schemas 2009-05-22 15:49:17.000000000 +0100 -+++ settings-daemon/settings-daemon.schemas 2009-05-22 15:51:31.000000000 +0100 -@@ -196,6 +196,27 @@ - </locale> - </schema> - -+ <schema> -+ <key>/schemas/desktop/gnome/sound/theme_name</key> -+ <applyto>/desktop/gnome/sound/theme_name</applyto> -+ <owner>gnome</owner> -+ <type>string</type> -+ <default>freedesktop</default> -+ <locale name="C"> -+ <short>Sound Theme Name</short> -+ </locale> -+ </schema> -+ -+ <schema> -+ <key>/schemas/desktop/gnome/sound/event_sounds</key> -+ <applyto>/desktop/gnome/sound/event_sounds</applyto> -+ <owner>gnome</owner> -+ <type>bool</type> -+ <default>true</default> -+ <locale name="C"> -+ <short>Enable Sound Events</short> -+ </locale> -+ </schema> - - </schemalist> - </gconfschemafile>
meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +4 -4
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc DEPENDS = "gconf glib-2.0 gtk+3" SECTION = "x11" -# SRCREV tagged 0.0.2 -SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" +PV .= "+git" +# SRCREV tagged 0.0.2 + one patch +SRCREV = "df669c6579a6ac7e1ef56be66617f35ae7d33d68" SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master;protocol=https \ - file://addsoundkeys.patch \ file://70settings-daemon.sh \ " UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig gconf features_check -FILES:${PN} = "${bindir}/* ${sysconfdir}" +FILES:${PN} = "${bindir}/* ${sysconfdir}" # Requires gdk-x11-2.0 which is provided by gtk when x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11"
Signature · 1 line
2.34.1
PATCH 31/37 dpkg: mark patches adding custom non-debian architectures as inappropriate for upstream
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- .../dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch | 2 +- .../dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch | 2 +- .../dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch | 2 +- meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch | 2 +- meta/recipes-devtools/dpkg/dpkg/arch_pm.patch | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch +1 -1
@@ -3,7 +3,7 @@ From: Khem Raj <[email protected]> Date: Wed, 29 Apr 2020 22:02:23 -0700 Subject: [PATCH] Add support for riscv32 CPU -Upstream-Status: Pending +Upstream-Status: Inappropriate [not a debian architecture] Signed-off-by: Khem Raj <[email protected]> --- data/cputable | 1 +
meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch +1 -1
@@ -3,7 +3,7 @@ From: sweeaun <[email protected]> Date: Sun, 10 Sep 2017 00:14:15 -0700 Subject: [PATCH] dpkg: Support muslx32 build -Upstream-Status: Pending +Upstream-Status: Inappropriate [not a debian architecture] Changes made on ostable and tupletable to enable muslx32 build. Signed-off-by: sweeaun <[email protected]>
meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch +1 -1
@@ -5,7 +5,7 @@ Subject: [PATCH] add musleabi to known target tripets helps compiling dpkg for musl/arm-softfloat -Upstream-Status: Pending +Upstream-Status: Inappropriate [not a debian architecture] Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Aníbal Limón <[email protected]> ---
meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch +1 -1
@@ -21,7 +21,7 @@ the required combination of "gnueabi-linux-armeb" was not found in the triplettable file thereby returning dpkg_arch as empty in configure script. -Upstream-Status: Pending +Upstream-Status: Inappropriate [not a debian architecture] Signed-off-by: Krishnanjanappa, Jagadeesh <[email protected]> Signed-off-by: Aníbal Limón <[email protected]>
meta/recipes-devtools/dpkg/dpkg/arch_pm.patch +1 -1
@@ -3,7 +3,7 @@ architecture for mips64, and possibly other arch's because of faulty code added to Arch.pm in the latest release from upstream. We remove that code. -Upstream-Status: Pending +Upstream-Status: Inappropriate [not a debian architecture] Signed-off-by: Joe Slater <[email protected]>
Signature · 1 line
2.34.1
PATCH 32/37 libacpi: mark patches as inactive-upstream
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- .../files/0001-libacpi-Fix-build-witth-fno-commom.patch | 2 +- meta/recipes-bsp/libacpi/files/ldflags.patch | 3 +-- meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch | 2 +- meta/recipes-bsp/libacpi/files/makefile-fix.patch | 2 +- .../libacpi/files/use_correct_strip_in_cross_environment.patch | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-)
meta/recipes-bsp/libacpi/files/0001-libacpi-Fix-build-witth-fno-commom.patch +1 -1
@@ -3,7 +3,7 @@ From: Khem Raj <[email protected]> Date: Wed, 5 Aug 2020 12:06:01 -0700 Subject: [PATCH] libacpi: Fix build witth -fno-commom -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] Signed-off-by: Khem Raj <[email protected]> ---
meta/recipes-bsp/libacpi/files/ldflags.patch +1 -2
@@ -1,7 +1,6 @@ libacpi: Remove QA warning: No GNU_HASH in the elf binary -Upstream-Status: Inappropriate [other] - Useful within bitbake environment only. +Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] Signed-off-by: Muhammad Shakeel <[email protected]>
meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] Fix libacpi for x32
meta/recipes-bsp/libacpi/files/makefile-fix.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] --- Makefile | 6 +++---
meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [last release before 2008, no vcs] Used the cross strip instead of host strip to avoid this build error:
Signature · 1 line
2.34.1
PATCH 33/37 python3-attrs: drop python3-ctypes from RDEPENDS
In reply to Steve SakomanFrom: Guðni Már Gilbert <[email protected]>
python3-ctypes was dropped as a dependency in v19.2.0
--- meta/recipes-devtools/python/python3-attrs_23.2.0.bb | 1 - 1 file changed, 1 deletion(-)
meta/recipes-devtools/python/python3-attrs_23.2.0.bb +0 -1
@@ -20,7 +20,6 @@ DEPENDS += " \ RDEPENDS:${PN}+= " \ python3-compression \ - python3-ctypes \ python3-crypt \ "
Signature · 1 line
2.34.1
PATCH 34/37 oeqa/runtime/scp: requires openssh-sftp-server
In reply to Steve SakomanFrom: Jose Quaresma <[email protected]>
The SCP protocol was deprecated in favor of the SFTP. For the legacy SCP protocol scp should be run with "-O". Instead of adding "-O" on the scp_options ssh oeqa we can require the openssh-sftp-server to be instaled on the target.
This way the test will work more deterministic regardless of the host machine client used.
For the old fashion clients still using legacy SCP protocol the openssh-sshd server will be used, for the new ones using the SFTP the openssh-sftp-server will be picked.
--- meta/lib/oeqa/runtime/cases/scp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/runtime/cases/scp.py +1 -1
@@ -25,7 +25,7 @@ class ScpTest(OERuntimeTestCase): os.remove(cls.tmp_path) @OETestDepends(['ssh.SSHTest.test_ssh']) - @OEHasPackage(['openssh-scp']) + @OEHasPackage({'openssh-scp', 'openssh-sftp-server'}) def test_scp_file(self): dst = '/tmp/test_scp_file'
Signature · 1 line
2.34.1
PATCH 35/37 openssh: drop rejected patch fixed in 8.6p1 release
In reply to Steve SakomanFrom: Jose Quaresma <[email protected]>
The rationale [1] is that C11 6.5.6.9 says:
"""
When two pointers are subtracted, both shall point to elements of the same array object, or one past the last element of the array object; the result is the difference of the subscripts of the two array elements. """
In these cases the objects are arrays of char so the result is defined, and we believe that the compiler incorrectly trapping on defined behaviour.
I also found https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63303
("Pointer subtraction is broken when using -fsanitize=undefined") which seems to support this position.
[1] https://bugzilla.mindrot.org/show_bug.cgi?id=2608
--- ...igned-overflow-in-pointer-arithmatic.patch | 111 ------------------ .../openssh/openssh_9.6p1.bb | 1 - 2 files changed, 112 deletions(-) delete mode 100644 meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch
meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch deleted +0 -111
@@ -1,111 +0,0 @@ -From 3328e98bcbf2930cd7eea3e6c92ad5dcbdf4794f 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 - -Pointer arithmatic results in implementation defined signed integer -type, so that 's - src' in strlcpy and others may trigger signed overflow. -In case of compilation by gcc or clang with -ftrapv option, the overflow -would lead to program abort. - -Upstream-Status: Submitted [http://bugzilla.mindrot.org/show_bug.cgi?id=2608] - -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 ++++++-- - openbsd-compat/strnlen.c | 8 ++++++-- - 3 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/openbsd-compat/strlcat.c b/openbsd-compat/strlcat.c -index bcc1b61..124e1e3 100644 ---- a/openbsd-compat/strlcat.c -+++ b/openbsd-compat/strlcat.c -@@ -23,6 +23,7 @@ - - #include <sys/types.h> - #include <string.h> -+#include <stdint.h> - - /* - * Appends src to string dst of size siz (unlike strncat, siz is the -@@ -42,7 +43,7 @@ strlcat(char *dst, const char *src, size_t siz) - /* Find the end of dst and adjust bytes left but don't go past end */ - while (n-- != 0 && *d != '\0') - d++; -- dlen = d - dst; -+ dlen = (uintptr_t)d - (uintptr_t)dst; - n = siz - dlen; - - if (n == 0) -@@ -55,8 +56,11 @@ strlcat(char *dst, const char *src, size_t siz) - s++; - } - *d = '\0'; -- -- return(dlen + (s - src)); /* count does not include NUL */ -+ /* -+ * Cast pointers to unsigned type before calculation, to avoid signed -+ * overflow when the string ends where the MSB has changed. -+ */ -+ return (dlen + ((uintptr_t)s - (uintptr_t)src)); /* count does not include NUL */ - } - - #endif /* !HAVE_STRLCAT */ -diff --git a/openbsd-compat/strlcpy.c b/openbsd-compat/strlcpy.c -index b4b1b60..b06f374 100644 ---- a/openbsd-compat/strlcpy.c -+++ b/openbsd-compat/strlcpy.c -@@ -23,6 +23,7 @@ - - #include <sys/types.h> - #include <string.h> -+#include <stdint.h> - - /* - * Copy src to string dst of size siz. At most siz-1 characters -@@ -51,8 +52,11 @@ strlcpy(char *dst, const char *src, size_t siz) - while (*s++) - ; - } -- -- return(s - src - 1); /* count does not include NUL */ -+ /* -+ * Cast pointers to unsigned type before calculation, to avoid signed -+ * overflow when the string ends where the MSB has changed. -+ */ -+ return ((uintptr_t)s - (uintptr_t)src - 1); /* count does not include NUL */ - } - - #endif /* !HAVE_STRLCPY */ -diff --git a/openbsd-compat/strnlen.c b/openbsd-compat/strnlen.c -index 7ad3573..7040f1f 100644 ---- a/openbsd-compat/strnlen.c -+++ b/openbsd-compat/strnlen.c -@@ -23,6 +23,7 @@ - #include <sys/types.h> - - #include <string.h> -+#include <stdint.h> - - size_t - strnlen(const char *str, size_t maxlen) -@@ -31,7 +32,10 @@ strnlen(const char *str, size_t maxlen) - - for (cp = str; maxlen != 0 && *cp != '\0'; cp++, maxlen--) - ; -- -- return (size_t)(cp - str); -+ /* -+ * Cast pointers to unsigned type before calculation, to avoid signed -+ * overflow when the string ends where the MSB has changed. -+ */ -+ return (size_t)((uintptr_t)cp - (uintptr_t)str); - } - #endif --- -2.17.1 -
meta/recipes-connectivity/openssh/openssh_9.6p1.bb +0 -1
@@ -22,7 +22,6 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar 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 \
Signature · 1 line
2.34.1
PATCH 36/37 openssh: systemd sd-notify patch was rejected upstream
In reply to Steve SakomanFrom: Jose Quaresma <[email protected]>
Still side effects of the XZ backdoor.
Racional [1]:
License incompatibility and library bloatedness were the reasons.
Given recent events we're never going to take a dependency on libsystemd, though we might implement the notification protocol ourselves if it isn't too much work.
[1] https://github.com/openssh/openssh-portable/pull/375#issuecomment-2027749729
--- ...001-systemd-Add-optional-support-for-systemd-sd_notify.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch +1 -1
@@ -6,7 +6,7 @@ Subject: [PATCH] systemd: Add optional support for systemd `sd_notify` This is a rebase of Dennis Lamm's <[email protected]> patch based on Jakub Jelen's <[email protected]> original patch -Upstream-Status: Submitted [https://github.com/openssh/openssh-portable/pull/375/commits/be187435911cde6cc3cef6982a508261074f1e56] +Upstream-Status: Denied [https://github.com/openssh/openssh-portable/pull/375/commits/be187435911cde6cc3cef6982a508261074f1e56] Signed-off-by: Xiangyu Chen <[email protected]> ---
Signature · 1 line
2.34.1
PATCH 37/37 openssh: systemd notification was implemented upstream
In reply to Steve SakomanFrom: Jose Quaresma <[email protected]>
Drop our sd-notify patch and switch to the upstream standalone implementation that does not depend on libsystemd.
--- ...-notify-systemd-on-listen-and-reload.patch | 225 ++++++++++++++++++ ...tional-support-for-systemd-sd_notify.patch | 99 -------- .../openssh/openssh/sshd.service | 2 +- .../openssh/openssh_9.6p1.bb | 4 +- 4 files changed, 227 insertions(+), 103 deletions(-) create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-notify-systemd-on-listen-and-reload.patch delete mode 100644 meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch
meta/recipes-connectivity/openssh/openssh/0001-notify-systemd-on-listen-and-reload.patch new file +225 -0
@@ -0,0 +1,225 @@ +From fc73e2405a8ca928465580b74a4d76112919367b Mon Sep 17 00:00:00 2001 +From: Damien Miller <[email protected]> +Date: Wed, 3 Apr 2024 14:40:32 +1100 +Subject: [PATCH] notify systemd on listen and reload + +Standalone implementation that does not depend on libsystemd. +With assistance from Luca Boccassi, and feedback/testing from Colin +Watson. bz2641 + +Upstream-Status: Backport [https://github.com/openssh/openssh-portable/commit/08f579231cd38a1c657aaa6ddeb8ab57a1fd4f5c] + +Signed-off-by: Jose Quaresma <[email protected]> +--- + configure.ac | 1 + + openbsd-compat/port-linux.c | 97 ++++++++++++++++++++++++++++++++++++- + openbsd-compat/port-linux.h | 5 ++ + platform.c | 11 +++++ + platform.h | 1 + + sshd.c | 2 + + 6 files changed, 115 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 82e8bb7c1..854f92b5b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -915,6 +915,7 @@ int main(void) { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) + AC_DEFINE([_PATH_BTMP], ["/var/log/btmp"], [log for bad login attempts]) + AC_DEFINE([USE_BTMP]) + AC_DEFINE([LINUX_OOM_ADJUST], [1], [Adjust Linux out-of-memory killer]) ++ AC_DEFINE([SYSTEMD_NOTIFY], [1], [Have sshd notify systemd on start/reload]) + inet6_default_4in6=yes + case `uname -r` in + 1.*|2.0.*) +diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c +index 0457e28d0..df7290246 100644 +--- a/openbsd-compat/port-linux.c ++++ b/openbsd-compat/port-linux.c +@@ -21,16 +21,23 @@ + + #include "includes.h" + +-#if defined(WITH_SELINUX) || defined(LINUX_OOM_ADJUST) ++#if defined(WITH_SELINUX) || defined(LINUX_OOM_ADJUST) || \ ++ defined(SYSTEMD_NOTIFY) ++#include <sys/socket.h> ++#include <sys/un.h> ++ + #include <errno.h> ++#include <inttypes.h> + #include <stdarg.h> + #include <string.h> + #include <stdio.h> + #include <stdlib.h> ++#include <time.h> + + #include "log.h" + #include "xmalloc.h" + #include "port-linux.h" ++#include "misc.h" + + #ifdef WITH_SELINUX + #include <selinux/selinux.h> +@@ -310,4 +317,90 @@ oom_adjust_restore(void) + return; + } + #endif /* LINUX_OOM_ADJUST */ +-#endif /* WITH_SELINUX || LINUX_OOM_ADJUST */ ++ ++#ifdef SYSTEMD_NOTIFY ++ ++static void ssh_systemd_notify(const char *, ...) ++ __attribute__((__format__ (printf, 1, 2))) __attribute__((__nonnull__ (1))); ++ ++static void ++ssh_systemd_notify(const char *fmt, ...) ++{ ++ char *s = NULL; ++ const char *path; ++ struct stat sb; ++ struct sockaddr_un addr; ++ int fd = -1; ++ va_list ap; ++ ++ if ((path = getenv("NOTIFY_SOCKET")) == NULL || strlen(path) == 0) ++ return; ++ ++ va_start(ap, fmt); ++ xvasprintf(&s, fmt, ap); ++ va_end(ap); ++ ++ /* Only AF_UNIX is supported, with path or abstract sockets */ ++ if (path[0] != '/' && path[0] != '@') { ++ error_f("socket \"%s\" is not compatible with AF_UNIX", path); ++ goto out; ++ } ++ ++ if (path[0] == '/' && stat(path, &sb) != 0) { ++ error_f("socket \"%s\" stat: %s", path, strerror(errno)); ++ goto out; ++ } ++ ++ memset(&addr, 0, sizeof(addr)); ++ addr.sun_family = AF_UNIX; ++ if (strlcpy(addr.sun_path, path, ++ sizeof(addr.sun_path)) >= sizeof(addr.sun_path)) { ++ error_f("socket path \"%s\" too long", path); ++ goto out; ++ } ++ /* Support for abstract socket */ ++ if (addr.sun_path[0] == '@') ++ addr.sun_path[0] = 0; ++ if ((fd = socket(PF_UNIX, SOCK_DGRAM, 0)) == -1) { ++ error_f("socket \"%s\": %s", path, strerror(errno)); ++ goto out; ++ } ++ if (connect(fd, &addr, sizeof(addr)) != 0) { ++ error_f("socket \"%s\" connect: %s", path, strerror(errno)); ++ goto out; ++ } ++ if (write(fd, s, strlen(s)) != (ssize_t)strlen(s)) { ++ error_f("socket \"%s\" write: %s", path, strerror(errno)); ++ goto out; ++ } ++ debug_f("socket \"%s\" notified %s", path, s); ++ out: ++ if (fd != -1) ++ close(fd); ++ free(s); ++} ++ ++void ++ssh_systemd_notify_ready(void) ++{ ++ ssh_systemd_notify("READY=1"); ++} ++ ++void ++ssh_systemd_notify_reload(void) ++{ ++ struct timespec now; ++ ++ monotime_ts(&now); ++ if (now.tv_sec < 0 || now.tv_nsec < 0) { ++ error_f("monotime returned negative value"); ++ ssh_systemd_notify("RELOADING=1"); ++ } else { ++ ssh_systemd_notify("RELOADING=1\nMONOTONIC_USEC=%llu", ++ ((uint64_t)now.tv_sec * 1000000ULL) + ++ ((uint64_t)now.tv_nsec / 1000ULL)); ++ } ++} ++#endif /* SYSTEMD_NOTIFY */ ++ ++#endif /* WITH_SELINUX || LINUX_OOM_ADJUST || SYSTEMD_NOTIFY */ +diff --git a/openbsd-compat/port-linux.h b/openbsd-compat/port-linux.h +index 3c22a854d..14064f87d 100644 +--- a/openbsd-compat/port-linux.h ++++ b/openbsd-compat/port-linux.h +@@ -30,4 +30,9 @@ void oom_adjust_restore(void); + void oom_adjust_setup(void); + #endif + ++#ifdef SYSTEMD_NOTIFY ++void ssh_systemd_notify_ready(void); ++void ssh_systemd_notify_reload(void); ++#endif ++ + #endif /* ! _PORT_LINUX_H */ +diff --git a/platform.c b/platform.c +index 4fe8744ee..9cf818153 100644 +--- a/platform.c ++++ b/platform.c +@@ -44,6 +44,14 @@ platform_pre_listen(void) + #endif + } + ++void ++platform_post_listen(void) ++{ ++#ifdef SYSTEMD_NOTIFY ++ ssh_systemd_notify_ready(); ++#endif ++} ++ + void + platform_pre_fork(void) + { +@@ -55,6 +63,9 @@ platform_pre_fork(void) + void + platform_pre_restart(void) + { ++#ifdef SYSTEMD_NOTIFY ++ ssh_systemd_notify_reload(); ++#endif + #ifdef LINUX_OOM_ADJUST + oom_adjust_restore(); + #endif +diff --git a/platform.h b/platform.h +index 7fef8c983..5dec23276 100644 +--- a/platform.h ++++ b/platform.h +@@ -21,6 +21,7 @@ + void platform_pre_listen(void); + void platform_pre_fork(void); + void platform_pre_restart(void); ++void platform_post_listen(void); + void platform_post_fork_parent(pid_t child_pid); + void platform_post_fork_child(void); + int platform_privileged_uidswap(void); +diff --git a/sshd.c b/sshd.c +index b4f2b9742..865331b46 100644 +--- a/sshd.c ++++ b/sshd.c +@@ -2077,6 +2077,8 @@ main(int ac, char **av) + ssh_signal(SIGTERM, sigterm_handler); + ssh_signal(SIGQUIT, sigterm_handler); + ++ platform_post_listen(); ++ + /* + * Write out the pid file after the sigterm handler + * is setup and the listen sockets are bound +-- +2.45.2 +
meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch deleted +0 -99
99 lines not on this page · raw message
meta/recipes-connectivity/openssh/openssh/sshd.service +1 -1
@@ -4,11 +4,11 @@ Wants=sshdgenkeys.service After=sshdgenkeys.service [Service] +Type=notify-reload Environment="SSHD_OPTS=" EnvironmentFile=-/etc/default/ssh ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/sshd ExecStart=-@SBINDIR@/sshd -D $SSHD_OPTS -ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID KillMode=process Restart=on-failure RestartSec=42s
meta/recipes-connectivity/openssh/openssh_9.6p1.bb +1 -3
@@ -25,7 +25,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar 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 \ + file://0001-notify-systemd-on-listen-and-reload.patch \ file://CVE-2024-6387.patch \ file://CVE-2024-39894.patch \ "
@@ -54,7 +54,6 @@ SYSTEMD_PACKAGES = "${PN}-sshd" SYSTEMD_SERVICE:${PN}-sshd = "${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','sshd.socket', '', d)} ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','sshd.service', '', d)}" inherit autotools-brokensep ptest pkgconfig -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" # systemd-sshd-socket-mode means installing sshd.socket # and systemd-sshd-service-mode corresponding to sshd.service
@@ -77,7 +76,6 @@ EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ --sysconfdir=${sysconfdir}/ssh \ --with-xauth=${bindir}/xauth \ --disable-strip \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)} \ " # musl doesn't implement wtmp/utmp and logwtmp
Signature · 1 line
2.34.1