From daf434b7cc058e7320cf3b6c56de4885a5c8535b Mon Sep 17 00:00:00 2001 From: puai Date: Fri, 23 May 2025 20:09:10 +0800 Subject: [PATCH] yocto: update software version *iproute,json-c,less,libaio,libcap,libdrm,libffi,libnl, *libtool,libxcrypt,libxslt,lua,ncurses Signed-off-by: puai --- .oebuild/manifest.yaml | 26 +++++++++---------- .../iproute2/iproute2_%.bbappend | 4 +++ .../libxcrypt/libxcrypt_%.bbappend | 1 + .../recipes-core/ncurses/ncurses_%.bbappend | 3 ++- .../recipes-devtools/json-c/json-c_%.bbappend | 19 +++++++++++--- .../recipes-devtools/libtool/libtool-src.inc | 3 ++- .../recipes-extended/less/less_%.bbappend | 3 ++- .../recipes-extended/libaio/libaio_%.bbappend | 4 ++- .../recipes-support/libcap/libcap_%.bbappend | 2 ++ .../recipes-support/libffi/libffi_%.bbappend | 1 + .../recipes-support/libnl/libnl_%.bbappend | 5 ++++ .../libxslt/libxslt_%.bbappend | 2 ++ 12 files changed, 53 insertions(+), 20 deletions(-) diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index 58b7f9d88c0..ff81d1f9895 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -644,7 +644,7 @@ manifest_list: version: 593392e1333e09635dc769590d7b63773bc0da05 iproute: remote_url: https://gitee.com/src-openeuler/iproute.git - version: d56da07c80afd33c1e5a630c711ac615f8101f94 + version: f387ba2b973e832920248c53cb736ec3b80f3895 iptables: remote_url: https://gitee.com/src-openeuler/iptables.git version: c4a6a13233d7eef46b0e2ff3e4744bf9eb41d4c1 @@ -665,7 +665,7 @@ manifest_list: version: 7b7c29369cfeb267efa7f45b271aca6910687461 json-c: remote_url: https://gitee.com/src-openeuler/json-c.git - version: 6dc397e53f36785bce0c0360af38278ab4b47c58 + version: 8fd212ebf52e7f7917595a7cc6da101e9aa0a75b json-glib: remote_url: https://gitee.com/src-openeuler/json-glib.git version: 9b59267d50cadffea9878c5b6d953b90a8cd0c1d @@ -728,7 +728,7 @@ manifest_list: version: 93ae5ec8240ca95743e6210461d2f2500d9968b9 less: remote_url: https://gitee.com/src-openeuler/less.git - version: 2ff8d8a32629d508797c5e9a9c24c516abd88ed0 + version: 7abdf0c8a031621e3d10e47d2cb1679eb5bf7580 lib-shim-v2: remote_url: https://gitee.com/src-openeuler/lib-shim-v2.git version: 9ac0a3345303ab6dd7e0fd032841312ee4c03302 @@ -788,7 +788,7 @@ manifest_list: version: 370b0508274589b15aed227ce7149320bba921ff libaio: remote_url: https://gitee.com/src-openeuler/libaio.git - version: a4819fb8ed49a02cb5d0dc277d87906ece8345e6 + version: 8b2c4e58ea9e24d35b2746f7cfabdf170e9c7c9d libarchive: remote_url: https://gitee.com/src-openeuler/libarchive.git version: 39b5141f3b9d094b21bea0c2f95ff21a9f097912 @@ -806,7 +806,7 @@ manifest_list: version: 8d5073344b22fe5646838667b82186af743dab82 libcap: remote_url: https://gitee.com/src-openeuler/libcap.git - version: 74dc5c1b1663b27f0fc0c7ae399bb645088906f3 + version: 5c919183b5bd99b0c9fb70dcb52929cc570c4689 libcap-ng: remote_url: https://gitee.com/src-openeuler/libcap-ng.git version: 8aa2535255c3c80690a91509dab4a8fa4a5e8008 @@ -827,7 +827,7 @@ manifest_list: version: 5d90b8b2bc69be335f0d6a679a3deb018ed0f302 libdrm: remote_url: https://gitee.com/src-openeuler/libdrm.git - version: 0ab4c2c0087f19ebe312972480b7955cceb32241 + version: 692b88ad139a459d7bc04c3aa3881c6ac396fd3b libedit: remote_url: https://gitee.com/src-openeuler/libedit.git version: 3b16fb128c1d1afce6bb6e71eeb8a94c77140e00 @@ -854,7 +854,7 @@ manifest_list: version: 41ebc2ca827fedd1335c72cea7b520c4aa4b8cd2 libffi: remote_url: https://gitee.com/src-openeuler/libffi.git - version: e2da93464db46f7fb4e676b2aa4350301e2968e2 + version: f428cccb6f18d840e69ea61cd4ab36f0a515eb6c libfm: remote_url: https://gitee.com/src-openeuler/libfm.git version: ec9580a527cf770aad65d520cac56ad243256999 @@ -917,7 +917,7 @@ manifest_list: version: dcf4a81785d42aa8b64de50dceb21b7e9211fb5a libnl: remote_url: https://gitee.com/src-openeuler/libnl3.git - version: d70c47398d6caba6961de570cd542731544b2ec9 + version: c01b2b55b02ae03b1c056b825f70a146ba74e38f libnotify: remote_url: https://gitee.com/src-openeuler/libnotify.git version: ed89889617327c5dafe6b1058269119cd8ea3bfe @@ -989,7 +989,7 @@ manifest_list: version: 9e9abd356a350e6646cfba4c82984f434a23e4ed libtool: remote_url: https://gitee.com/src-openeuler/libtool.git - version: 5363da05081f04e46c52d11a6f33bb4b29f0222d + version: b6f6b40f1b3e9a466ef410287845841d4fe98c1c libunistring: remote_url: https://gitee.com/src-openeuler/libunistring.git version: d68e5a14a0ac44bf02b5dd2041e21f0fff849a47 @@ -1028,7 +1028,7 @@ manifest_list: version: fd63b258b0d892f556e67e770dbfecc498647360 libxcrypt: remote_url: https://gitee.com/src-openeuler/libxcrypt.git - version: 5ab42945e82f759d2ed114453c33ced5b8581a76 + version: efc36896ba8756287e436e3cc51b95e940c1e16a libxcvt: remote_url: https://gitee.com/src-openeuler/libxcvt.git version: 0c4a236f854f9de32b244fee90e6a4abefa32370 @@ -1046,7 +1046,7 @@ manifest_list: version: dd76c83b28cc18cb237fbbb9d5e82e38dd2a7cbc libxslt: remote_url: https://gitee.com/src-openeuler/libxslt.git - version: 2839c0df41ddd3201f3d428d578e88945ed1076b + version: 7e8770ccd5ebcbbd7abaeefda7248121c3331040 libyaml: remote_url: https://gitee.com/src-openeuler/libyaml.git version: 2ea62abe5c4fc030316fa519f719b8ba6f676a2d @@ -1070,7 +1070,7 @@ manifest_list: version: 408157072df6247803dc33800d2e1177085d276c lua: remote_url: https://gitee.com/src-openeuler/lua.git - version: 3f54e146b7bea9a622b18f91b40ecde41d54e3d6 + version: c6173a1462006185ebbfdef2a1c405abfd444f01 luajit: remote_url: https://gitee.com/src-openeuler/luajit.git version: 495b12677282ca2a472eaaac05527eafafe2137a @@ -1184,7 +1184,7 @@ manifest_list: version: 50624d406c2550c3b3e8b5c4c29298159d28f771 ncurses: remote_url: https://gitee.com/src-openeuler/ncurses.git - version: 2752b605a689c8c9fd4b4a84fceddb493cb4ae71 + version: e8afff4af096b55a960025055c8324154290c2e1 net-tools: remote_url: https://gitee.com/src-openeuler/net-tools.git version: 02b4115eb1ab45d7a7460ab04129983fa26abfca diff --git a/meta-openeuler/recipes-connectivity/iproute2/iproute2_%.bbappend b/meta-openeuler/recipes-connectivity/iproute2/iproute2_%.bbappend index dc4944a8505..c6b063523f4 100644 --- a/meta-openeuler/recipes-connectivity/iproute2/iproute2_%.bbappend +++ b/meta-openeuler/recipes-connectivity/iproute2/iproute2_%.bbappend @@ -12,6 +12,10 @@ SRC_URI:append = " \ file://backport-rdma-Update-uapi-headers.patch \ file://backport-rdma-Add-support-to-dump-SRQ-resource-in-raw-format.patch \ file://backport-rdma-Fix-the-error-of-accessing-string-variable-outs.patch \ + file://backport-ss-fix-expired-time-format-of-timer.patch \ + file://backport-route-filter-by-interface-on-multipath-routes.patch \ + file://backport-lib-names-check-calloc-return-value-in-db_names_alloc.patch \ + file://backport-fix-fd-leak-when-playing-with-netns.patch \ file://feature-iproute-add-support-for-ipvlan-l2e-mode.patch \ file://bugfix-iproute2-cancel-some-test-cases.patch \ file://backport-exit-exec-in-child-process-if-setup-fails.patch \ diff --git a/meta-openeuler/recipes-core/libxcrypt/libxcrypt_%.bbappend b/meta-openeuler/recipes-core/libxcrypt/libxcrypt_%.bbappend index b3c28d441a4..885a653568d 100644 --- a/meta-openeuler/recipes-core/libxcrypt/libxcrypt_%.bbappend +++ b/meta-openeuler/recipes-core/libxcrypt/libxcrypt_%.bbappend @@ -5,6 +5,7 @@ PV = "4.4.36" SRC_URI:prepend = "file://v${PV}.tar.gz \ file://add-sm3-crypt-support.patch \ file://add-loongarch-support-for-libxcrypt.patch \ + file://libxcrypt-4.4.26-sw.patch \ " S = "${WORKDIR}/${BP}" diff --git a/meta-openeuler/recipes-core/ncurses/ncurses_%.bbappend b/meta-openeuler/recipes-core/ncurses/ncurses_%.bbappend index a970549a83d..472b5bff5ea 100644 --- a/meta-openeuler/recipes-core/ncurses/ncurses_%.bbappend +++ b/meta-openeuler/recipes-core/ncurses/ncurses_%.bbappend @@ -1,3 +1,4 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" PV = "6.4" CVE_VERSION = "${PV}" @@ -23,10 +24,10 @@ SRC_URI += "file://${BP}.tar.gz \ file://backport-CVE-2023-45918.patch \ " -FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" # from oe-core SRC_URI += "\ file://exit_prototype.patch \ + file://ncurses-sw-support.patch \ " S = "${WORKDIR}/${BP}" diff --git a/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend b/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend index 8f500f28336..a2ef321723a 100644 --- a/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend +++ b/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend @@ -4,13 +4,26 @@ PV = "0.17-20230812" # openeuler src package -SRC_URI:prepend = " \ - file://${BP}.tar.gz \ +SRC_URI:remove = " \ file://backport-fix-issue-854-Set-error-json_tokener_error_memory-in.patch \ file://backport-Handle-yet-another-out-of-memory-condition.patch \ file://backport-Issue-857-fix-a-few-places-where-json_tokener-should.patch \ file://backport-Take-2-fixing-the-placement-of-json_tokener_error_memory.patch \ - " +" + +SRC_URI:prepend = " \ + file://${BP}.tar.gz \ + file://backport-fix-issue-854-Set-error-json_tokener_error_memory-in.patch \ + file://backport-Handle-yet-another-out-of-memory-condition.patch \ + file://backport-Issue-857-fix-a-few-places-where-json_tokener-should.patch \ + file://backport-Take-2-fixing-the-placement-of-json_tokener_error_memory.patch \ + file://backport-Issue-867-disallow-control-characters-in-strict-mode.patch \ + file://backport-Fix-the-expected-output-for-test_parse.patch \ + file://backport-Fix-issue-875-cast-to-unsigned-char-so-bytes-above-0.patch \ + file://backport-Fix-the-apps-json_parse-s-strict-option-so-it-actual.patch \ + file://backport-Handle-NULL-gracefully-in-json_tokener_free.patch \ + file://backport-Issue-881-don-t-allow-json_tokener_new_ex-with-a-dep.patch \ +" SRC_URI[md5sum] = "6d724389b0a08c519d9dd6e2fac7efb8" SRC_URI[sha256sum] = "024d302a3aadcbf9f78735320a6d5aedf8b77876c8ac8bbb95081ca55054c7eb" diff --git a/meta-openeuler/recipes-devtools/libtool/libtool-src.inc b/meta-openeuler/recipes-devtools/libtool/libtool-src.inc index 59c03a6dd0f..bac647cb294 100644 --- a/meta-openeuler/recipes-devtools/libtool/libtool-src.inc +++ b/meta-openeuler/recipes-devtools/libtool/libtool-src.inc @@ -7,4 +7,5 @@ SRC_URI:prepend = "file://libtool-${PV}.tar.xz \ SRC_URI:prepend:class-target = "file://libtool-2.4.5-rpath.patch \ file://backport-tests-link-order.at-avoid-warning-and-test-failure.patch \ - " + file://add-sw_64-support.patch \ +" diff --git a/meta-openeuler/recipes-extended/less/less_%.bbappend b/meta-openeuler/recipes-extended/less/less_%.bbappend index 9874c9b200b..4ee6a260e98 100644 --- a/meta-openeuler/recipes-extended/less/less_%.bbappend +++ b/meta-openeuler/recipes-extended/less/less_%.bbappend @@ -18,7 +18,8 @@ SRC_URI = "file://${BP}.tar.gz \ file://backport-Fix-for-previous-fix.patch \ file://backport-Avoid-stealing-data-from-an-input-program-that-uses-.patch \ file://backport-Do-not-assume-PATH_MAX-is-defined.patch \ - " + file://backport-Fix-bug-related-to-ctrl-X-when-output-is-not-a-termi.patch \ +" CAUSE_CONFIGURE_ERR = " \ file://less-475-fsync.patch \ " diff --git a/meta-openeuler/recipes-extended/libaio/libaio_%.bbappend b/meta-openeuler/recipes-extended/libaio/libaio_%.bbappend index 6fdfe35b17a..58d23d91d3a 100644 --- a/meta-openeuler/recipes-extended/libaio/libaio_%.bbappend +++ b/meta-openeuler/recipes-extended/libaio/libaio_%.bbappend @@ -19,7 +19,9 @@ SRC_URI:prepend = "file://${BP}.tar.gz \ file://0004-libaio-makefile-add-D_FORTIFY_SOURCE-flag.patch \ file://0005-Fix-compile-error-that-exec-checking-need-super-priv.patch \ file://0007-Fix-build-error-if-compiler-is-clang.patch \ - " + file://0008-Move-semicolon-to-SYMVER-and-DEFSYMVER-call-sites.patch \ + file://0009-Use-new-symver-function-attribute-to-support-LTO-bui.patch \ +" S = "${WORKDIR}/${BP}" diff --git a/meta-openeuler/recipes-support/libcap/libcap_%.bbappend b/meta-openeuler/recipes-support/libcap/libcap_%.bbappend index aff81681c15..96bd55dcf57 100644 --- a/meta-openeuler/recipes-support/libcap/libcap_%.bbappend +++ b/meta-openeuler/recipes-support/libcap/libcap_%.bbappend @@ -11,6 +11,8 @@ SRC_URI = " \ file://support-specify-cc.patch \ file://backport-getpcaps-fix-program-name-in-help-message.patch \ file://backport-Stop-using-_pam_overwrite-in-pam_cap.c.patch \ + file://backport-CVE-2025-1390-pam_cap-Fix-potential-configuration-parsing-error.patch \ + file://backport-Address-some-static-analysis-observations.patch \ " S = "${WORKDIR}/${BP}" diff --git a/meta-openeuler/recipes-support/libffi/libffi_%.bbappend b/meta-openeuler/recipes-support/libffi/libffi_%.bbappend index e4b3b16c2aa..cfd665de66f 100644 --- a/meta-openeuler/recipes-support/libffi/libffi_%.bbappend +++ b/meta-openeuler/recipes-support/libffi/libffi_%.bbappend @@ -4,4 +4,5 @@ SRC_URI:prepend = " \ file://${BP}.tar.gz \ file://backport-Fix-signed-vs-unsigned-comparison.patch \ file://fix-AARCH64EB-support.patch \ + file://libffi-Add-sw64-architecture.patch \ " diff --git a/meta-openeuler/recipes-support/libnl/libnl_%.bbappend b/meta-openeuler/recipes-support/libnl/libnl_%.bbappend index d5d4ac20773..7cffb44681e 100644 --- a/meta-openeuler/recipes-support/libnl/libnl_%.bbappend +++ b/meta-openeuler/recipes-support/libnl/libnl_%.bbappend @@ -23,6 +23,11 @@ SRC_URI:prepend = "file://${BP}.tar.gz \ file://backport-fix-error-handling-in-nl_str2ip_protos.patch \ file://backport-handle-negative-and-zero-size-in-nla_memcpy.patch \ file://backport-use-thread-safe-gmtime_r-instead-of-gmtime.patch \ + file://backport-fix-ubsan-complaint-about-incorrect.patch \ + file://backport-fix-new-object-in-callback-v2-on-update-obj.patch \ + file://backport-fix-IPv6-ecmp-route-deleted-nexthop-matching.patch \ + file://backport-treat-routes-with-via-nexthops-as-univers-scoped.patch \ + file://backport-keep-link-info-instead-of-release-and-reacquire.patch \ " SRC_URI[md5sum] = "b381405afd14e466e35d29a112480333" diff --git a/meta-openeuler/recipes-support/libxslt/libxslt_%.bbappend b/meta-openeuler/recipes-support/libxslt/libxslt_%.bbappend index 792e8d414bc..8ee1f60283e 100644 --- a/meta-openeuler/recipes-support/libxslt/libxslt_%.bbappend +++ b/meta-openeuler/recipes-support/libxslt/libxslt_%.bbappend @@ -5,6 +5,8 @@ PV = "1.1.39" SRC_URI = " \ file://${BP}.tar.xz \ file://CVE-2015-9019.patch \ + file://CVE-2024-55549.patch \ + file://CVE-2025-24855.patch \ " EXTRA_OECONF:remove = "--with-html-subdir=${BPN}" -- Gitee