From 504d95ce300882996376886457fa77072aa3b32a Mon Sep 17 00:00:00 2001 From: hbmm Date: Fri, 20 Jun 2025 10:16:01 +0800 Subject: [PATCH] yocto: update some software * sudo,util-linux,rsyslog,ruby,shadow,texinfo Signed-off-by: hbmm --- .oebuild/manifest.yaml | 12 ++-- .../rsyslog/rsyslog_%.bbappend | 8 +++ .../util-linux/util-linux-common.inc | 64 +++++++++++++++++++ .../recipes-devtools/ruby/ruby_%.bbappend | 5 ++ .../recipes-extended/shadow/shadow_%.bbappend | 5 ++ .../recipes-extended/sudo/sudo_%.bbappend | 2 + .../texinfo/texinfo_%.bbappend | 1 + 7 files changed, 91 insertions(+), 6 deletions(-) diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index d8c6d08f312..ed2d21a527e 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -1868,10 +1868,10 @@ manifest_list: version: 971261784ff3281ab94f251ca7d15cfea0ce711d rsyslog: remote_url: https://gitee.com/src-openeuler/rsyslog.git - version: a863db08433569cdcee644f6959057b58c4da210 + version: 636cbcd8d6fa09a8255eda27118a9fb26a01844b ruby: remote_url: https://gitee.com/src-openeuler/ruby.git - version: e66a1ec6882cf3de988f74eab375f2fef658f29d + version: b40f3ef7a78d553e9d6cd2c24611c5ca54c8ec19 sbc: remote_url: https://gitee.com/src-openeuler/sbc.git version: 4b56de87403be1d718c857f7ae21575eec0de402 @@ -1895,7 +1895,7 @@ manifest_list: version: 7e0c57f90501b5015536b41b9438cadd561d0059 shadow: remote_url: https://gitee.com/src-openeuler/shadow.git - version: 09b7df485634db5e8b46719d0851b944aee48307 + version: ea8310c23b44cdc13efce53033b1d8f0512dd894 shared-mime-info: remote_url: https://gitee.com/src-openeuler/shared-mime-info.git version: 3face457a12d6c1c2487b3267d91fb2a9bfcaf0b @@ -1964,7 +1964,7 @@ manifest_list: version: afe66fe86f9ef51261a7747f73735259b4349989 sudo: remote_url: https://gitee.com/src-openeuler/sudo.git - version: fe2f22cd3841b4fecd4bee7efb3797db6a848aa9 + version: bc212c98439e57e9f16554d35d7de3deb56888af suitesparse: remote_url: https://gitee.com/src-openeuler/suitesparse.git version: 3094fb883bcb7bf6507ff13e72f0cff98aee2051 @@ -2018,7 +2018,7 @@ manifest_list: version: 93c4fe54d78f06c6458a8b994e0936aa6d30c1ef texinfo: remote_url: https://gitee.com/src-openeuler/texinfo.git - version: 9ba2eb163228342de2725a2d5b01627cc74e3e42 + version: 410e820010b7389cad4776fc2bc1b8926c2fecba third_party_openh264: remote_url: https://gitee.com/openharmony/third_party_openh264.git version: c6aa372c16fddab4203dce3c67a81fb8f7b6eb94 @@ -2084,7 +2084,7 @@ manifest_list: version: 237f02daea02bcd2a85046a88597c919bdb153f5 util-linux: remote_url: https://gitee.com/src-openeuler/util-linux.git - version: f0d15a9138f2079d7ada331d4056a62d564fa6f3 + version: 5ec454eac3a75e9c735ef0591ec0057b1755e727 util-macros: remote_url: https://gitee.com/src-openeuler/xorg-x11-util-macros.git version: c8b86724c81d31460b474aa978294a4f912dce20 diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/rsyslog/rsyslog_%.bbappend index 54642f59776..82bb0e5472f 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -19,6 +19,14 @@ SRC_URI =+ " \ file://backport-omfile-do-not-carry-out-actual-action-when-writing-to-dev-null.patch \ file://backport-fix-memory-leak-in-omazureeventhubs-on-accepted-PN_D.patch \ file://tls-bugfix-parameter-StreamDriver_CRLFile-not-known.patch \ + file://backport-Fix-passing-the-value-to-EscapeChar.patch \ + file://backport-Do-not-free-the-uninitialized-cstring.patch \ + file://backport-Keep-original-free-pattern.patch \ + file://backport-network-subsystem-improve-connection-failure-error-m.patch \ + file://backport-Fix-runConf-NULL-pointer-refence.patch \ + file://backport-rainerscript-do-not-try-to-call-a-function-if-it-doe.patch \ + file://backport-nsd_ptcp-regression-fix-remove-debugging-messages-em.patch \ + file://backport-Fix-legacy-ActionQueueDiscardMark-parameter.patch \ " # file://0001-tests-disable-the-check-for-inotify.patch diff --git a/meta-openeuler/recipes-core/util-linux/util-linux-common.inc b/meta-openeuler/recipes-core/util-linux/util-linux-common.inc index 2796f0d107a..498801e08fa 100644 --- a/meta-openeuler/recipes-core/util-linux/util-linux-common.inc +++ b/meta-openeuler/recipes-core/util-linux/util-linux-common.inc @@ -33,7 +33,71 @@ SRC_URI:prepend = " \ file://backport-libmount-make-sure-option-is-used-as-string.patch \ file://backport-libmount-fix-possible-memory-leak.patch \ file://backport-libmount-Fix-atime-remount-for-new-API.patch \ + file://backport-sys-utils-setpriv-fix-potential-memory-leak.patch \ + file://backport-sys-utils-save_adjtime-fix-memory-leak.patch \ + file://backport-wall-fix-possible-memory-leak.patch \ + file://backport-suL-fix-use-after-free-on-error.patch \ + file://backport-cfdisk-add-hint-about-labels-for-bootable-flag.patch \ + file://backport-column-fix-memory-leak.patch \ + file://backport-column-fix-l.patch \ + file://backport-scriptreplay-support-ctrl-s-and-ctrl-g.patch \ + file://backport-login-use-correct-terminal-fd-during-setup.patch \ + file://backport-login-prevent-undefined-ioctl-and-tcsetattr-calls.patch \ + file://backport-libblkid-avoid-memory-leak-of-cachefile-path.patch \ + file://backport-more-avoid-out-of-bound-access.patch \ + file://backport-lslogins-fix-realloc-loop-allocation-size.patch \ + file://backport-ldattach-don-t-call-exit-from-signal-handler.patch \ + file://backport-libblkid-ntfs-validate-that-sector_size-is-a-power-o.patch \ + file://backport-blkid-fix-call-to-err_exclusive_options.patch \ + file://backport-libblkid-reset-errno-before-calling-probefuncs.patch \ + file://backport-lib-path-fix-possible-out-of-boundary-access.patch \ + file://backport-libmount-fix-possible-NULL-dereference-coverity-scan.patch \ + file://backport-libsmartcols-drop-spourious-newline-in-between-strea.patch \ + file://backport-libsmartcols-flush-correct-stream.patch \ + file://backport-libsmartcols-only-recognize-closed-object-as-final-e.patch \ + file://backport-cal-avoid-out-of-bound-write.patch \ + file://backport-libfdisk-sun-properly-initialize-partition-data.patch \ + file://backport-include-c.h-add-helpers-for-unaligned-structure-acce.patch \ + file://backport-libblkid-probe-read-data-in-chunks.patch \ + file://backport-libblkid-avoid-aligning-out-of-probing-area.patch \ + file://backport-libblkid-drbd-validate-zero-padding.patch \ + file://backport-more-exit-if-POLLERR-and-POLLHUP-on-stdin-is-receive.patch \ + file://backport-libblkid-hfsplus-reduce-false-positive.patch \ + file://backport-wall-fix-calloc-cal-Werror-calloc-transposed-args.patch \ + file://backport-libblkid-drbd-reduce-false-positive.patch \ + file://backport-lib-cpuset-exit-early-from-cpulist_parse.patch \ + file://backport-sys-utils-lscpu-Unblock-SIGSEGV-before-vmware_bdoor.patch \ + file://backport-libblkid-Check-offset-in-LUKS2-header.patch \ + file://backport-more-fix-poll-use.patch \ + file://backport-lscpu-don-t-use-NULL-sharedmap.patch \ + file://backport-hexdump-check-blocksize-when-display-data.patch \ + file://backport-lslocks-fix-buffer-overflow.patch \ + file://backport-last-avoid-out-of-bounds-array-access.patch \ + file://backport-lsipc-fix-semaphore-USED-counter.patch \ + file://backport-fsck.minix-fix-possible-overrun.patch \ + file://backport-wall-make-sure-unsigned-variable-not-underflow.patch \ + file://backport-Fix-ul_path_read_buffer.patch \ + file://backport-libblkid-constify-cached-disk-data.patch \ + file://backport-jsonwrt-add-ul_jsonwrt_flush.patch \ + file://backport-dmesg-print-object-closing-brace-while-waiting-for-n.patch \ + file://backport-sys-utils-hwclock-rtc-fix-pointer-usage.patch \ + file://backport-rev-Check-for-wchar-conversion-errors.patch \ + file://backport-libsmartcols-fix-column-reduction.patch \ + file://backport-libmount-cleanup-fake-mode.patch \ + file://backport-lsmem-make-lsmem-to-check-for-the-nodes-more-robust.patch \ + file://backport-cfdisk-fix-possible-integer-overflow-coverity-scan.patch \ + file://backport-more-make-sure-we-have-data-on-stderr.patch \ + file://backport-libblkid-apfs-validate-checksums.patch \ + file://backport-lscpu-add-riscv-cputype-support.patch \ + file://backport-libblkid-fix-potential-memory-leaks.patch \ + file://backport-sys-utils-fix-add-NULL-check-for-mnt_fs_get_target-r.patch \ + file://backport-sulogin-fix-POSIX-locale-use.patch \ + file://backport-setpriv.c-fix-memory-leak-in-parse_groups-function.patch \ + file://backport-whereis-avoid-accessing-uninitialized-memory.patch \ + file://backport-dmesg-fix-notime-use.patch \ file://sfdisk-fix-crash-casued-by-out-of-bounds-access.patch \ + file://mount-fix-use-option-owner-mount-failed.patch \ + file://mkfs.bfs-fix-memory-leaks-and-weak-code.patch \ " # unapplicable OE patches: diff --git a/meta-openeuler/recipes-devtools/ruby/ruby_%.bbappend b/meta-openeuler/recipes-devtools/ruby/ruby_%.bbappend index 0497402b9af..aa204bcc061 100644 --- a/meta-openeuler/recipes-devtools/ruby/ruby_%.bbappend +++ b/meta-openeuler/recipes-devtools/ruby/ruby_%.bbappend @@ -31,6 +31,11 @@ SRC_URI:prepend = " \ file://backport-CVE-2024-43398-upgrade-lib-rexml-to-3.3.6.patch \ file://backport-CVE-2024-47220.patch \ file://backport-CVE-2024-49761.patch \ + file://backport-CVE-2025-25186.patch \ + file://backport-CVE-2025-27219.patch \ + file://backport-CVE-2025-27220.patch \ + file://backport-0001-CVE-2025-27221.patch \ + file://backport-0002-CVE-2025-27221.patch \ " SRC_URI:remove = " \ diff --git a/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend b/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend index 1040db9cd8c..89edb72c416 100644 --- a/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend +++ b/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend @@ -21,6 +21,11 @@ SRC_URI:prepend = "file://${BP}.tar.xz \ file://shadow-libsubid-Dealocate-memory-on-exit.patch \ file://backport-lib-idmapping.c--Use-long-constants-in-prctl-2.patch \ file://backport-man-lastlog-remove-wrong-use-of-keyword-term.patch \ + file://backport-lib-csrand.c-Fix-the-lower-part-of-the-domain-of-csr.patch \ + file://limit-username-length-to-32.patch \ + file://backport-src-useradd.c-get_groups-Fix-memory-leak.patch \ + file://backport-src-gpasswd-Clear-password-in-more-cases.patch \ + file://backport-lib-encrypt.c-Do-not-exit-in-error-case.patch \ " # remove patches with the same functionality in src-openeuler from poky: # file://shadow-update-pam-conf.patch diff --git a/meta-openeuler/recipes-extended/sudo/sudo_%.bbappend b/meta-openeuler/recipes-extended/sudo/sudo_%.bbappend index 53135425812..239809eaece 100644 --- a/meta-openeuler/recipes-extended/sudo/sudo_%.bbappend +++ b/meta-openeuler/recipes-extended/sudo/sudo_%.bbappend @@ -11,6 +11,8 @@ SRC_URI:remove = " \ SRC_URI:prepend = "file://${BP}.tar.gz \ file://Fix-compilation-error-on-sw64-arch.patch \ + file://backport-If-user-s-tty-goes-away-tell-monitor-to-revoke-the-t.patch \ + file://backport-Avoid-using-ioctl-TIOCNOTTY-in-the-monitor.patch \ " SRC_URI[sha256sum] = "558d10b9a1991fb3b9fa7fa7b07ec4405b7aefb5b3cb0b0871dbc81e3a88e558" diff --git a/meta-openeuler/recipes-extended/texinfo/texinfo_%.bbappend b/meta-openeuler/recipes-extended/texinfo/texinfo_%.bbappend index e38a2e19eab..bfc9635fd43 100644 --- a/meta-openeuler/recipes-extended/texinfo/texinfo_%.bbappend +++ b/meta-openeuler/recipes-extended/texinfo/texinfo_%.bbappend @@ -3,6 +3,7 @@ PV = "7.0.3" # openeuler source SRC_URI:prepend = "file://${BP}.tar.xz \ + file://add-support-sw_64.patch \ " # for version 7.0.3, compare the differences in upstream recipe SRC_URI[sha256sum] = "3cc5706fb086b895e1dc2b407aade9f95a3a233ff856273e2b659b089f117683" -- Gitee