From 8001f8a60c9e67c58f6b6bb3d2a5de657ea900cd Mon Sep 17 00:00:00 2001 From: puai Date: Thu, 5 Sep 2024 07:18:25 +0000 Subject: [PATCH 1/4] yocto: update third party software version * update acl,busybox,gdb,gtest,json-c,libatomic-ops, * libogg,libpwquality,libseccomp,meson,nasm,openssl, * popt,quota,rclpy,rpcbind,tzdata,util-linux,zlib Signed-off-by: puai --- .oebuild/manifest.yaml | 38 +++++++++---------- .../libpwquality/libpwquality_%.bbappend | 1 + .../googletest/googletest_%.bbappend | 1 + .../recipes-ros/rclpy/rclpy_%.bbappend | 1 + .../openssl/openssl_%.bbappend | 18 ++++++++- .../recipes-core/busybox/busybox_%.bbappend | 1 + .../libseccomp/libseccomp_%.bbappend | 1 + .../recipes-core/tzdata/timezone-append.inc | 2 + .../util-linux/util-linux-common.inc | 3 +- .../recipes-core/zlib/zlib_%.bbappend | 4 +- .../recipes-devtools/gdb/gdb-src.inc | 1 + .../recipes-devtools/json-c/json-c_%.bbappend | 2 +- .../recipes-devtools/meson/meson_%.bbappend | 4 +- .../recipes-devtools/nasm/nasm_%.bbappend | 7 ++-- .../recipes-extended/quota/quota_%.bbappend | 1 + .../libogg/libogg_%.bbappend | 2 +- .../recipes-support/acl/acl_%.bbappend | 8 ++-- .../libatomic-ops/libatomic-ops_%.bbappend | 6 +-- .../recipes-support/popt/popt_%.bbappend | 2 +- 19 files changed, 64 insertions(+), 39 deletions(-) diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index 9a1c10a9f56..85755928ffe 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -47,7 +47,7 @@ manifest_list: version: ada460ea14a8ddfb5de825cc398c09b252c737b8 acl: remote_url: https://gitee.com/src-openeuler/acl.git - version: 3d8d8158744824af8dffc7686596b7017ae96231 + version: f6f3070eb47100002efc395b2093f7dbfb1afb45 adwaita-icon-theme: remote_url: https://gitee.com/src-openeuler/adwaita-icon-theme.git version: 309630a8cb0d1de484f025e6d7fb2b92b0d278de @@ -143,7 +143,7 @@ manifest_list: version: 0bcdf88fed7a69ade17d89e7d118db1afe767751 busybox: remote_url: https://gitee.com/src-openeuler/busybox.git - version: c1846db8b6adff15cc0aadf11a995cc0e9c8fb01 + version: aa928a448987999a85ad39fbe548ea1224079dc1 bzip2: remote_url: https://gitee.com/src-openeuler/bzip2.git version: 1ab56ce50bd4f5606ba575d7396141686abcb25c @@ -362,7 +362,7 @@ manifest_list: version: 5f6931e0f1feade0704df1d8ae7e7b78776233be gdb: remote_url: https://gitee.com/src-openeuler/gdb.git - version: d34c029cc11bdc42a40707b5cd2bbda2ee8d6827 + version: fe472bb6b4a5d27510693031b25208a698c2dc85 gdbm: remote_url: https://gitee.com/src-openeuler/gdbm.git version: eac827f0e53317e9b87a08fc97a80098585485cc @@ -452,7 +452,7 @@ manifest_list: version: d7370cdb445562ea66214e3816e36426d0ab6bfb gtest: remote_url: https://gitee.com/src-openeuler/gtest.git - version: f8102d6e33bb3437652b612e0c9dcd178cf0e4f8 + version: 6158d2a9f75bda016e54bd2cdf1626d9c681ec7b gtk+3: remote_url: https://gitee.com/src-openeuler/gtk3.git version: edba6fa0fab56a21cf1bed35b7b8a5aa6a963b83 @@ -563,7 +563,7 @@ manifest_list: version: 71b57b4bf4ba8ae50e0e28b7f5c63d2bc74c0fe3 json-c: remote_url: https://gitee.com/src-openeuler/json-c.git - version: 9aa8f7484e10807e6c91b502a12d19c6a9699613 + version: 92c71e338e5fdfa4ecf82caf728a30701b9e5216 kbd: remote_url: https://gitee.com/src-openeuler/kbd.git version: 843429f20574d595d3ef006793b59df0301d7e25 @@ -677,7 +677,7 @@ manifest_list: version: 3cb4064dbe8ce2ef46c7aa02ea670e3a69f1a959 libatomic-ops: remote_url: https://gitee.com/src-openeuler/libatomic_ops.git - version: 069e338813cc0d440acc3b54cdce9e8b1823c23e + version: 5c9d6a0e13f7a0eb50e305de30793551958890cc libboundscheck: remote_url: https://gitee.com/src-openeuler/libboundscheck.git version: 7ffcd596b083b464e60ae59eaabfe3e6f82053a0 @@ -797,7 +797,7 @@ manifest_list: version: 9a8b85c3bbd12f92b2f60bce78e90e0704fc7921 libogg: remote_url: https://gitee.com/src-openeuler/libogg.git - version: 4541713ab2d7f47f75ed21c42914a12e144bf853 + version: 2a510b090c152b033d43d46f92b91e3d6ecc0937 libpcap: remote_url: https://gitee.com/src-openeuler/libpcap.git version: 7f96009de3da35064f32b4648bb1d0d4cb505357 @@ -809,7 +809,7 @@ manifest_list: version: 894443bf11fd9361e63f154d92d6c01bb22093f2 libpwquality: remote_url: https://gitee.com/src-openeuler/libpwquality.git - version: 659e1cac750cf45f5cdfc4afe231eb3e96dd65a7 + version: fd187d00929289c1d930b1b6563dff83b60a0537 librepo: remote_url: https://gitee.com/src-openeuler/librepo.git version: dee4679beafbabc573a0543bb85d45d27d15aa03 @@ -818,7 +818,7 @@ manifest_list: version: cd956459b96e405dff4a4155f92d1944f130a673 libseccomp: remote_url: https://gitee.com/src-openeuler/libseccomp.git - version: 14ac05d08e028a8769e78dc5b6c56552eaa43a80 + version: 40cce6781bdb410e4a5ca47bfc33f94b724ce752 libselinux: remote_url: https://gitee.com/src-openeuler/libselinux.git version: 2348cc687f87fb933be48a91b7127c75874d5aa5 @@ -986,7 +986,7 @@ manifest_list: version: 01bcdcb57f4960e5210d5b132d44bfc65b41c476 meson: remote_url: https://gitee.com/src-openeuler/meson.git - version: eb7ddaa9d616edd9213967d1edf2e76c4830b057 + version: 3381bb6f53c42dd0de8676fe8a2112ae6727b011 message-filters: remote_url: https://gitee.com/src-openeuler/message_filters.git version: a7830e4e950e7931ba7e1756784d6316dcef5673 @@ -1007,7 +1007,7 @@ manifest_list: version: 48992f21a953d8c0720b93ed98fb5f2ea40f84a5 nasm: remote_url: https://gitee.com/src-openeuler/nasm.git - version: e8f11304d13859972ca586f66e1fc8e132c15a7b + version: 07b72bf8ecbd4cce03b52812ac7e132ddd1fd741 navigation2: remote_url: https://gitee.com/src-openeuler/navigation2.git version: 055b7023116b5a37cff387e4a3fdb396c86045b6 @@ -1061,7 +1061,7 @@ manifest_list: version: fd34c4ef7f35f8451d3203132d8f13400be2b87a openssl: remote_url: https://gitee.com/src-openeuler/openssl.git - version: fe3837c2cfc7e4b63a0a9310dd29cbf1fc4afeee + version: aeaaede904df0f278a23ddabf52b71b5a5e15174 orc: remote_url: https://gitee.com/src-openeuler/orc.git version: 10791eb57d0b51ceffe434d9947f32efc827e22a @@ -1148,7 +1148,7 @@ manifest_list: version: 2260c02de06921af19a601f339d9cb26b1d5ae69 popt: remote_url: https://gitee.com/src-openeuler/popt.git - version: 000f128a298609e880661fdd5998d6a4dd798044 + version: d14ab4d4698770f1a49d30e9df86858174be1d8e powertop: remote_url: https://gitee.com/src-openeuler/powertop.git version: bb2d64d406aebaea72cd7dfc9e719faf11c45fc2 @@ -1430,7 +1430,7 @@ manifest_list: version: e7982134da4045463d63a3f94ccc685abc5028a3 quota: remote_url: https://gitee.com/src-openeuler/quota.git - version: 35f9c43662d52a23df8bad5bbe09f103729c1f60 + version: 6f829023a9f3f4b11962126c62acbafb04b9fe2c raspberrypi-bluetooth: remote_url: https://gitee.com/src-openeuler/raspberrypi-bluetooth.git version: 21d9a9a008c54d72dbdd356852d6cfa80f5fe518 @@ -1451,7 +1451,7 @@ manifest_list: version: d5249a62739a60017da7db4d5c489675b92b7ea5 rclpy: remote_url: https://gitee.com/src-openeuler/rclpy.git - version: 860977c811a6fc1d09674993578793d857e8b83f + version: 4d9e9730f49168e4509d17f0cd1bd0d06c83434c rcpputils: remote_url: https://gitee.com/src-openeuler/rcpputils.git version: 568e3af236d589658a106a143b592f1193afce35 @@ -1550,7 +1550,7 @@ manifest_list: version: efbd72f7254a4cd0fd1833b7ec287ba1a8adaca7 rpcbind: remote_url: https://gitee.com/src-openeuler/rpcbind.git - version: 6a34adaa73768dfddf22ff6a00dc343f712fe80c + version: 93663fdb2e14a10b3570a59a78f10e5bb8330039 rpcsvc-proto: remote_url: https://gitee.com/src-openeuler/rpcsvc-proto.git version: 30d4b6d37d5eb19d658bef47ba4265a031c842d2 @@ -1718,7 +1718,7 @@ manifest_list: version: 1370aeba6969b893018bd157b49aa2c64e7fe2da tzdata: remote_url: https://gitee.com/src-openeuler/tzdata.git - version: 386c90f5f0b0ce7eda81c334b9cb3508272f9557 + version: d188efd9e8596a18e67a2ad7217e5c298758f4b8 trusted-firmware-a: remote_url: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git version: 5b986f0188e1b785a35d6c40f8a95c58887227fd @@ -1748,7 +1748,7 @@ manifest_list: version: 41b47213777373b98d22ed93e3941fb8c2aa05c1 util-linux: remote_url: https://gitee.com/src-openeuler/util-linux.git - version: 4a9d2e828f9fb4ab1ccd75d2a71e355ce8631ee5 + version: 0f88790229a8450f47f260031ec2f564f56d3572 util-macros: remote_url: https://gitee.com/src-openeuler/xorg-x11-util-macros.git version: c8b86724c81d31460b474aa978294a4f912dce20 @@ -1886,7 +1886,7 @@ manifest_list: version: 64c318ba078b800451428297b3081978ea273477 zlib: remote_url: https://gitee.com/src-openeuler/zlib.git - version: 20d8ac9247f71d5a05a10a8d508e89f69636fc26 + version: 4b426a2b0de77d73b71baf70888e61ec4ff49bb1 zstd: remote_url: https://gitee.com/src-openeuler/zstd.git version: 1bd03ae8e15c88c9bad864c65fa6b3998f3fa07f diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend index 8a2be1e3a3c..069cc2bf0c4 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend @@ -12,6 +12,7 @@ SRC_URI =+ " \ file://modify-pwquality_conf.patch \ file://fix-password-similarity.patch \ file://fix-doc-about-difok.patch \ + file://backport-Make-maxclassrepeat-1-behavior-consistent-with-docs.patch \ " # do not enable python bindings, as well as not use gettext to translate diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-test/googletest/googletest_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-test/googletest/googletest_%.bbappend index 15523d82f53..d14fbba017b 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-test/googletest/googletest_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-test/googletest/googletest_%.bbappend @@ -28,3 +28,4 @@ CXXFLAGS:append = " -fPIC" # if we are not building shared libraries # RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG","shared","","${PN}-staticdev",d)}" +SRC_URI[sha256sum] = "8ad4a4d328dce9226a23158420548f4dcb4303edd2cd4068e03d1385701d9080" diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/rclpy/rclpy_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/rclpy/rclpy_%.bbappend index 4ad8794f929..51d9fd566e2 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/rclpy/rclpy_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/rclpy/rclpy_%.bbappend @@ -8,3 +8,4 @@ do_install:append() { } INSANE_SKIP:${PN} += "already-stripped" +SRC_URI[sha256sum] = "6f685bf6eba43ac21f6dcfad35142f76d4aab519c791572a82433e4fe0f35f16" diff --git a/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend b/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend index 930ba0328f7..49790735176 100644 --- a/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend +++ b/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend @@ -35,8 +35,24 @@ SRC_URI:prepend = "file://${BP}.tar.gz \ file://Backport-Add-NULL-checks-where-ContentInfo-data-can-be-NULL.patch \ file://Backport-Fix-SM4-XTS-aarch64-assembly-implementation-bug.patch \ file://fix-add-loongarch64-target.patch \ + file://backport-CVE-2024-2511-Fix-unconstrained-session-cache-growth-in-TLSv1.3.patch \ + file://backport-Add-a-test-for-session-cache-handling.patch \ + file://backport-Extend-the-multi_resume-test-for-simultaneous-resump.patch \ + file://backport-Hardening-around-not_resumable-sessions.patch \ + file://backport-Add-a-test-for-session-cache-overflow.patch \ + file://backport-CVE-2024-4603-Check-DSA-parameters-for-exce.patch \ + file://Backport-Add-a-test-for-late-loading-of-an-ENGINE-in-TLS.patch \ + file://Backport-Don-t-attempt-to-set-provider-params-on-an-ENGINE-ba.patch \ + file://Backport-CVE-2024-4741-Only-free-the-read-buffers-if-we-re-not-using-them.patch \ + file://Backport-CVE-2024-4741-Set-rlayer.packet-to-NULL-after-we-ve-finished-using.patch \ + file://Backport-CVE-2024-4741-Extend-the-SSL_free_buffers-testing.patch \ + file://Backport-CVE-2024-4741-Move-the-ability-to-load-the-dasync-engine-into-sslt.patch \ + file://Backport-CVE-2024-4741-Further-extend-the-SSL_free_buffers-testing.patch \ + file://Backport-bn-Properly-error-out-if-aliasing-return-value-with-.patch \ + file://Backport-CVE-2024-5535-Fix-SSL_select_next_proto.patch \ + file://Backport-CVE-2024-5535-Add-a-test-for-ALPN-and-NPN.patch \ " do_install:append () { #Remove the empty directory that conflict with ca-certificates. rm -rf ${D}${sysconfdir}/ssl/certs -} \ No newline at end of file +} diff --git a/meta-openeuler/recipes-core/busybox/busybox_%.bbappend b/meta-openeuler/recipes-core/busybox/busybox_%.bbappend index 432ac3cd4e4..7a1a42f3762 100644 --- a/meta-openeuler/recipes-core/busybox/busybox_%.bbappend +++ b/meta-openeuler/recipes-core/busybox/busybox_%.bbappend @@ -25,6 +25,7 @@ SRC_URI:append = " \ file://${BP}.tar.bz2 \ file://backport-CVE-2022-28391.patch \ file://backport-CVE-2022-48174.patch \ + file://backport-CVE-2023-42363.patch \ file://init.cfg \ file://rcS.default \ file://mdev.cfg \ diff --git a/meta-openeuler/recipes-core/libseccomp/libseccomp_%.bbappend b/meta-openeuler/recipes-core/libseccomp/libseccomp_%.bbappend index cf4c5c4abae..2d2e9469521 100644 --- a/meta-openeuler/recipes-core/libseccomp/libseccomp_%.bbappend +++ b/meta-openeuler/recipes-core/libseccomp/libseccomp_%.bbappend @@ -7,6 +7,7 @@ SRC_URI:prepend = " \ file://backport-arch-disambiguate-in-arch-syscall-validate.patch \ file://Add-64-bit-LoongArch-support.patch \ file://fix-build-error-for-libseccomp.patch \ + file://fix_undefined_behavior_in_scmp_bpf_sim.patch \ " S = "${WORKDIR}/${BP}" diff --git a/meta-openeuler/recipes-core/tzdata/timezone-append.inc b/meta-openeuler/recipes-core/tzdata/timezone-append.inc index a0dc3339875..9577d798c75 100644 --- a/meta-openeuler/recipes-core/tzdata/timezone-append.inc +++ b/meta-openeuler/recipes-core/tzdata/timezone-append.inc @@ -18,6 +18,8 @@ SRC_URI = " \ file://remove-El_Aaiun-timezone.patch \ file://remove-Israel-timezone.patch \ file://skip-check_web-testcase.patch \ + file://Asia-Almaty-matches-Asia-Tashkent-from-now-on.patch \ + file://America-Scoresbysund-matches-America-Nuuk-from-now-o.patch \ " SRC_URI[tzcode.sha256sum] = "80072894adff5a458f1d143e16e4ca1d8b2a122c9c5399da482cb68cba6a1ff8" 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 b1c8ffe460f..73e6b91ef69 100644 --- a/meta-openeuler/recipes-core/util-linux/util-linux-common.inc +++ b/meta-openeuler/recipes-core/util-linux/util-linux-common.inc @@ -37,5 +37,4 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=12ae7768a65ec8f2e44d930df9cb43fa file://libfdisk/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ " - -SRC_URI[sha256sum] = "890ae8ff810247bd19e274df76e8371d202cda01ad277681b0ea88eeaa00286b" +SRC_URI[sha256sum] = "d23d0a22e716ccc42b4526715416bf222c276c36b41c1deec462b13a1cac6e78" diff --git a/meta-openeuler/recipes-core/zlib/zlib_%.bbappend b/meta-openeuler/recipes-core/zlib/zlib_%.bbappend index 20885f34d81..7273439c282 100644 --- a/meta-openeuler/recipes-core/zlib/zlib_%.bbappend +++ b/meta-openeuler/recipes-core/zlib/zlib_%.bbappend @@ -1,13 +1,13 @@ #main bbfile: yocto-poky/meta/recipes-core/zlib/zlib_1.2.11.bb #version in openEuler -PV = "1.3.1" +PV = "1.2.13" # files, patches that come from openeuler SRC_URI = " \ file://${BP}.tar.xz \ file://backport-zlib-1.2.5-minizip-fixuncrypt.patch \ - file://backport-fix-undefined-buffer-detected-by-oss-fuzz.patch \ + file://backport-CVE-2023-45853.patch \ " # files, patches that come from openeuler for aarch64, there are compile err in 0004-zlib-Optimize-CRC32.patch, not apply diff --git a/meta-openeuler/recipes-devtools/gdb/gdb-src.inc b/meta-openeuler/recipes-devtools/gdb/gdb-src.inc index 82bbb1640b7..fdcb470f4b4 100644 --- a/meta-openeuler/recipes-devtools/gdb/gdb-src.inc +++ b/meta-openeuler/recipes-devtools/gdb/gdb-src.inc @@ -98,3 +98,4 @@ do_install:append:riscv64() { rm -rf ${D}/usr/lib64 } +SRC_URI[sha256sum] = "f11df3194f99d6eda173a342646b131c1dfabd19fc49813c39b9b7de19fc734a" diff --git a/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend b/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend index be72d0f76f1..8d655197d3a 100644 --- a/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend +++ b/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend @@ -9,6 +9,6 @@ SRC_URI:prepend = " \ " SRC_URI[md5sum] = "6d724389b0a08c519d9dd6e2fac7efb8" -SRC_URI[sha256sum] = "024d302a3aadcbf9f78735320a6d5aedf8b77876c8ac8bbb95081ca55054c7eb" +SRC_URI[sha256sum] = "10c69b3cb5851f8bde67264ff7d8d679abe310441789e78d4b8225d0d9b09504" S = "${WORKDIR}/json-c-json-c-${PV}" diff --git a/meta-openeuler/recipes-devtools/meson/meson_%.bbappend b/meta-openeuler/recipes-devtools/meson/meson_%.bbappend index 05df293bf3a..d2d100e93b8 100644 --- a/meta-openeuler/recipes-devtools/meson/meson_%.bbappend +++ b/meta-openeuler/recipes-devtools/meson/meson_%.bbappend @@ -1,4 +1,4 @@ -PV = "1.1.1" +PV = "1.3.1" -SRC_URI:prepend = "file://${BP}.tar.gz \ +SRC_URI = "file://${PV}.tar.gz \ " diff --git a/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend b/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend index 4698326bcac..94f55c8bbdf 100644 --- a/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend +++ b/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend @@ -1,14 +1,13 @@ # main bbfile: yocto-poky/meta/recipes-devtools/nasm/nasm_2.15.05.bb -PV = "2.16.01" +PV = "2.16.03" # upstream patches update FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}/:" -SRC_URI:remove = "file://CVE-2022-44370.patch" - # files, patches that come from openeuler -SRC_URI:prepend = "file://${BP}.tar.xz \ +SRC_URI = "file://${BP}.tar.xz \ file://enable-make-check.patch \ file://fix-help-info-error.patch \ " +SRC_URI[sha256sum] = "bef3de159bcd61adf98bb7cc87ee9046e944644ad76b7633f18ab063edb29e57" diff --git a/meta-openeuler/recipes-extended/quota/quota_%.bbappend b/meta-openeuler/recipes-extended/quota/quota_%.bbappend index 9b413d0ceb3..fa12faec982 100644 --- a/meta-openeuler/recipes-extended/quota/quota_%.bbappend +++ b/meta-openeuler/recipes-extended/quota/quota_%.bbappend @@ -16,6 +16,7 @@ SRC_URI += " \ file://0002-quotaio_xfs-Warn-when-large-kernel-timestamps-cannot.patch \ file://0004-quota_nld-Initialize-sa_mask-when-registering-PID-fi.patch \ file://0005-quota-nld-fix-open-PID-file-failed-when-systemd-read.patch \ + file://0006-common.c-fix-strncat-usage.patch \ " SRC_URI[tarball.md5sum] = "aef94648438832b684978d46fdf75110" diff --git a/meta-openeuler/recipes-multimedia/libogg/libogg_%.bbappend b/meta-openeuler/recipes-multimedia/libogg/libogg_%.bbappend index e3d7249ff6a..7ef80836e59 100644 --- a/meta-openeuler/recipes-multimedia/libogg/libogg_%.bbappend +++ b/meta-openeuler/recipes-multimedia/libogg/libogg_%.bbappend @@ -5,4 +5,4 @@ PV = "1.3.5" SRC_URI:prepend = " file://${BP}.tar.xz " SRC_URI[md5sum] = "3178c98341559657a15b185bf5d700a5" -SRC_URI[sha256sum] = "c4d91be36fc8e54deae7575241e03f4211eb102afb3fc0775fbbc1b740016705" +SRC_URI[sha256sum] = "2ab280022897c4927b1347d023df22631ed76cf9e6d9f029d9c9d4cf4764fe3f" diff --git a/meta-openeuler/recipes-support/acl/acl_%.bbappend b/meta-openeuler/recipes-support/acl/acl_%.bbappend index 8bd2c293900..3954555b9aa 100644 --- a/meta-openeuler/recipes-support/acl/acl_%.bbappend +++ b/meta-openeuler/recipes-support/acl/acl_%.bbappend @@ -1,11 +1,13 @@ # main bbfile: yocto-poky/meta/recipes-support/attr/acl_2.2.53.bb # acl version in openEuler -PV = "2.3.1" +PV = "2.3.2 -SRC_URI:prepend = "file://${BP}.tar.gz " +SRC_URI = "file://${BP}.tar.xz \ + file://backport-acl_copy_entry-Prevent-accidental-NULL-pointer-deref.patch \ +" # because PV is different, the md5 and sha256 should also be updated SRC_URI[md5sum] = "3cecb80cb0a52a0b273e6698ba642263" -SRC_URI[sha256sum] = "760c61c68901b37fdd5eefeeaf4c0c7a26bdfdd8ac747a1edff1ce0e243c11af" +SRC_URI[sha256sum] = "5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c" diff --git a/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend b/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend index 03de601562c..ba03bce199b 100644 --- a/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend +++ b/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend @@ -8,6 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " # apply src and patch from openEuler -SRC_URI:prepend = "file://libatomic_ops-${PV}.tar.gz \ - file://0001-add-sw_64-support.patch \ - " +SRC_URI = "file://libatomic_ops-${PV}.tar.gz \ + " +SRC_URI[sha256sum] = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51" diff --git a/meta-openeuler/recipes-support/popt/popt_%.bbappend b/meta-openeuler/recipes-support/popt/popt_%.bbappend index afae1260705..75f8ec43e7d 100644 --- a/meta-openeuler/recipes-support/popt/popt_%.bbappend +++ b/meta-openeuler/recipes-support/popt/popt_%.bbappend @@ -15,5 +15,5 @@ SRC_URI:prepend = "file://${BP}.tar.gz \ " SRC_URI[md5sum] = "eaa2135fddb6eb03f2c87ee1823e5a78" -SRC_URI[sha256sum] = "c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9" +SRC_URI[sha256sum] = "bef3de159bcd61adf98bb7cc87ee9046e944644ad76b7633f18ab063edb29e57" LIC_FILES_CHKSUM = "file://COPYING;md5=e0206ac9471d06667e076212db20c5f4" -- Gitee From a2d6d4f59f576ba136b1abd2adce21d387d0bfdd Mon Sep 17 00:00:00 2001 From: puai Date: Thu, 5 Sep 2024 10:11:40 +0000 Subject: [PATCH 2/4] yocto: update third party software version * update acl,busybox,gdb,gtest,json-c,libatomic-ops, * libogg,libpwquality,libseccomp,meson,nasm,openssl, * popt,quota,rclpy,rpcbind,tzdata,util-linux,zlib Signed-off-by: puai --- .../0001-Make-CPU-family-warnings-fatal.patch | 33 +++++++++---------- ...-not-manipulate-the-environment-when.patch | 8 ++--- ...pport-building-allarch-recipes-again.patch | 12 +++---- .../recipes-devtools/meson/meson_%.bbappend | 7 ++++ .../recipes-support/acl/acl_%.bbappend | 2 +- .../libatomic-ops/libatomic-ops_%.bbappend | 5 +-- 6 files changed, 36 insertions(+), 31 deletions(-) diff --git a/meta-openeuler/recipes-devtools/meson/files/0001-Make-CPU-family-warnings-fatal.patch b/meta-openeuler/recipes-devtools/meson/files/0001-Make-CPU-family-warnings-fatal.patch index 848dccfbe72..04397255d5e 100644 --- a/meta-openeuler/recipes-devtools/meson/files/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta-openeuler/recipes-devtools/meson/files/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 Mon Sep 17 00:00:00 2001 +From b77cbe67df5fa0998946503f207c256ee740bb5f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal @@ -7,15 +7,15 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ross Burton --- - mesonbuild/envconfig.py | 2 +- - mesonbuild/environment.py | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) + mesonbuild/envconfig.py | 4 ++-- + mesonbuild/environment.py | 6 ++---- + 2 files changed, 4 insertions(+), 6 deletions(-) -Index: meson-0.60.2/mesonbuild/envconfig.py -=================================================================== ---- meson-0.60.2.orig/mesonbuild/envconfig.py -+++ meson-0.60.2/mesonbuild/envconfig.py -@@ -266,8 +266,8 @@ class MachineInfo(HoldableObject): +diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py +index 07f1229..a35c356 100644 +--- a/mesonbuild/envconfig.py ++++ b/mesonbuild/envconfig.py +@@ -285,8 +285,8 @@ class MachineInfo(HoldableObject): 'but is missing {}.'.format(minimum_literal - set(literal))) cpu_family = literal['cpu_family'] @@ -26,13 +26,13 @@ Index: meson-0.60.2/mesonbuild/envconfig.py endian = literal['endian'] if endian not in ('little', 'big'): -Index: meson-0.60.2/mesonbuild/environment.py -=================================================================== ---- meson-0.60.2.orig/mesonbuild/environment.py -+++ meson-0.60.2/mesonbuild/environment.py -@@ -354,10 +354,8 @@ def detect_cpu_family(compilers: Compile - if any_compiler_has_define(compilers, '__64BIT__'): - trial = 'ppc64' +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index 2ba2054..d798e3b 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -359,10 +359,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: + if compilers and not any_compiler_has_define(compilers, '__mips64'): + trial = 'mips' - if trial not in known_cpu_families: - mlog.warning(f'Unknown CPU family {trial!r}, please report this at ' @@ -42,4 +42,3 @@ Index: meson-0.60.2/mesonbuild/environment.py + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) return trial - diff --git a/meta-openeuler/recipes-devtools/meson/files/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta-openeuler/recipes-devtools/meson/files/0001-python-module-do-not-manipulate-the-environment-when.patch index 19502fa9cd8..2e0a4b1bbe6 100644 --- a/meta-openeuler/recipes-devtools/meson/files/0001-python-module-do-not-manipulate-the-environment-when.patch +++ b/meta-openeuler/recipes-devtools/meson/files/0001-python-module-do-not-manipulate-the-environment-when.patch @@ -1,4 +1,4 @@ -From a97dba12cff6c4c9181909141a1a9f38d7c900bf Mon Sep 17 00:00:00 2001 +From e85683698aa3556bf14fc6d35f2c067f16af520b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 19 Nov 2018 14:24:26 +0100 Subject: [PATCH] python module: do not manipulate the environment when calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py -index 14386f9..118a15f 100644 +index 9aea6bd..8c13ede 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py -@@ -354,9 +354,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -380,9 +380,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', empty.name = 'python' return empty @@ -25,7 +25,7 @@ index 14386f9..118a15f 100644 try: return PythonPkgConfigDependency(name, env, kwargs, installation, True) finally: -@@ -365,8 +362,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -391,8 +388,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', os.environ[name] = value elif name in os.environ: del os.environ[name] diff --git a/meta-openeuler/recipes-devtools/meson/files/0002-Support-building-allarch-recipes-again.patch b/meta-openeuler/recipes-devtools/meson/files/0002-Support-building-allarch-recipes-again.patch index dcc1ce9c27a..a8396f30bbe 100644 --- a/meta-openeuler/recipes-devtools/meson/files/0002-Support-building-allarch-recipes-again.patch +++ b/meta-openeuler/recipes-devtools/meson/files/0002-Support-building-allarch-recipes-again.patch @@ -1,21 +1,22 @@ -From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00 2001 +From 6fb8db54929b40e1fd7ac949ef44f0d37df0bae9 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 -Subject: [PATCH 2/2] Support building allarch recipes again +Subject: [PATCH] Support building allarch recipes again This registers "allarch" as a known CPU family. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Peter Kjellerstedt + --- mesonbuild/envconfig.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 4d58c91..ff01ad1 100644 +index a35c356..436355f 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -36,6 +36,7 @@ from pathlib import Path +@@ -38,6 +38,7 @@ from pathlib import Path known_cpu_families = ( @@ -23,6 +24,3 @@ index 4d58c91..ff01ad1 100644 'aarch64', 'alpha', 'arc', --- -2.24.0 - diff --git a/meta-openeuler/recipes-devtools/meson/meson_%.bbappend b/meta-openeuler/recipes-devtools/meson/meson_%.bbappend index d2d100e93b8..9a9c51eaadd 100644 --- a/meta-openeuler/recipes-devtools/meson/meson_%.bbappend +++ b/meta-openeuler/recipes-devtools/meson/meson_%.bbappend @@ -1,4 +1,11 @@ PV = "1.3.1" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" SRC_URI = "file://${PV}.tar.gz \ + file://meson-setup.py \ + file://meson-wrapper \ + file://0001-python-module-do-not-manipulate-the-environment-when.patch \ + file://0001-Make-CPU-family-warnings-fatal.patch \ + file://0002-Support-building-allarch-recipes-again.patch \ " +SRC_URI[sha256sum] = "6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7"" diff --git a/meta-openeuler/recipes-support/acl/acl_%.bbappend b/meta-openeuler/recipes-support/acl/acl_%.bbappend index 3954555b9aa..3a7bdd62cc8 100644 --- a/meta-openeuler/recipes-support/acl/acl_%.bbappend +++ b/meta-openeuler/recipes-support/acl/acl_%.bbappend @@ -1,7 +1,7 @@ # main bbfile: yocto-poky/meta/recipes-support/attr/acl_2.2.53.bb # acl version in openEuler -PV = "2.3.2 +PV = "2.3.2" SRC_URI = "file://${BP}.tar.xz \ diff --git a/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend b/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend index ba03bce199b..c359e033670 100644 --- a/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend +++ b/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " # apply src and patch from openEuler -SRC_URI = "file://libatomic_ops-${PV}.tar.gz \ - " +SRC_URI:prepend = "file://libatomic_ops-${PV}.tar.gz \ + file://0001-add-sw_64-support.patch \ + " SRC_URI[sha256sum] = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51" -- Gitee From 3d5f6a4accb00534c7fd77d1fb32d450b68dba4b Mon Sep 17 00:00:00 2001 From: puai Date: Thu, 5 Sep 2024 10:25:33 +0000 Subject: [PATCH 3/4] yocto: update third party software version * update acl,busybox,gdb,gtest,json-c,libatomic-ops, * libogg,libpwquality,libseccomp,meson,nasm,openssl, * popt,quota,rclpy,rpcbind,tzdata,util-linux,zlib Signed-off-by: puai --- meta-openeuler/recipes-devtools/meson/meson_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openeuler/recipes-devtools/meson/meson_%.bbappend b/meta-openeuler/recipes-devtools/meson/meson_%.bbappend index 9a9c51eaadd..127d0205e0a 100644 --- a/meta-openeuler/recipes-devtools/meson/meson_%.bbappend +++ b/meta-openeuler/recipes-devtools/meson/meson_%.bbappend @@ -8,4 +8,4 @@ SRC_URI = "file://${PV}.tar.gz \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ " -SRC_URI[sha256sum] = "6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7"" +SRC_URI[sha256sum] = "6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7" -- Gitee From 75d4d0c09c6a44e68e72beb74e2d3b50b634e7c7 Mon Sep 17 00:00:00 2001 From: puai Date: Thu, 5 Sep 2024 07:18:25 +0000 Subject: [PATCH 4/4] yocto: update software version * update acl,busybox,gdb,gtest,json-c,libatomic-ops, * libogg,libpwquality,libseccomp,meson,nasm,openssl, * popt,quota,rclpy,rpcbind,tzdata,util-linux,zlib Signed-off-by: puai --- .oebuild/manifest.yaml | 38 +++++++++---------- .../libpwquality/libpwquality_%.bbappend | 1 + .../googletest/googletest_%.bbappend | 1 + .../recipes-ros/rclpy/rclpy_%.bbappend | 1 + .../openssl/openssl_%.bbappend | 18 ++++++++- .../recipes-core/busybox/busybox_%.bbappend | 1 + .../libseccomp/libseccomp_%.bbappend | 1 + .../recipes-core/tzdata/timezone-append.inc | 2 + .../util-linux/util-linux-common.inc | 3 +- .../recipes-core/zlib/zlib_%.bbappend | 4 +- .../recipes-devtools/gdb/gdb-src.inc | 1 + .../recipes-devtools/json-c/json-c_%.bbappend | 2 +- .../0001-Make-CPU-family-warnings-fatal.patch | 33 ++++++++-------- ...-not-manipulate-the-environment-when.patch | 8 ++-- ...pport-building-allarch-recipes-again.patch | 12 +++--- .../recipes-devtools/meson/meson_%.bbappend | 11 +++++- .../recipes-devtools/nasm/nasm_%.bbappend | 7 ++-- .../recipes-extended/quota/quota_%.bbappend | 1 + .../libogg/libogg_%.bbappend | 2 +- .../recipes-support/acl/acl_%.bbappend | 8 ++-- .../libatomic-ops/libatomic-ops_%.bbappend | 5 ++- .../recipes-support/popt/popt_%.bbappend | 2 +- 22 files changed, 96 insertions(+), 66 deletions(-) diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index 9a1c10a9f56..85755928ffe 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -47,7 +47,7 @@ manifest_list: version: ada460ea14a8ddfb5de825cc398c09b252c737b8 acl: remote_url: https://gitee.com/src-openeuler/acl.git - version: 3d8d8158744824af8dffc7686596b7017ae96231 + version: f6f3070eb47100002efc395b2093f7dbfb1afb45 adwaita-icon-theme: remote_url: https://gitee.com/src-openeuler/adwaita-icon-theme.git version: 309630a8cb0d1de484f025e6d7fb2b92b0d278de @@ -143,7 +143,7 @@ manifest_list: version: 0bcdf88fed7a69ade17d89e7d118db1afe767751 busybox: remote_url: https://gitee.com/src-openeuler/busybox.git - version: c1846db8b6adff15cc0aadf11a995cc0e9c8fb01 + version: aa928a448987999a85ad39fbe548ea1224079dc1 bzip2: remote_url: https://gitee.com/src-openeuler/bzip2.git version: 1ab56ce50bd4f5606ba575d7396141686abcb25c @@ -362,7 +362,7 @@ manifest_list: version: 5f6931e0f1feade0704df1d8ae7e7b78776233be gdb: remote_url: https://gitee.com/src-openeuler/gdb.git - version: d34c029cc11bdc42a40707b5cd2bbda2ee8d6827 + version: fe472bb6b4a5d27510693031b25208a698c2dc85 gdbm: remote_url: https://gitee.com/src-openeuler/gdbm.git version: eac827f0e53317e9b87a08fc97a80098585485cc @@ -452,7 +452,7 @@ manifest_list: version: d7370cdb445562ea66214e3816e36426d0ab6bfb gtest: remote_url: https://gitee.com/src-openeuler/gtest.git - version: f8102d6e33bb3437652b612e0c9dcd178cf0e4f8 + version: 6158d2a9f75bda016e54bd2cdf1626d9c681ec7b gtk+3: remote_url: https://gitee.com/src-openeuler/gtk3.git version: edba6fa0fab56a21cf1bed35b7b8a5aa6a963b83 @@ -563,7 +563,7 @@ manifest_list: version: 71b57b4bf4ba8ae50e0e28b7f5c63d2bc74c0fe3 json-c: remote_url: https://gitee.com/src-openeuler/json-c.git - version: 9aa8f7484e10807e6c91b502a12d19c6a9699613 + version: 92c71e338e5fdfa4ecf82caf728a30701b9e5216 kbd: remote_url: https://gitee.com/src-openeuler/kbd.git version: 843429f20574d595d3ef006793b59df0301d7e25 @@ -677,7 +677,7 @@ manifest_list: version: 3cb4064dbe8ce2ef46c7aa02ea670e3a69f1a959 libatomic-ops: remote_url: https://gitee.com/src-openeuler/libatomic_ops.git - version: 069e338813cc0d440acc3b54cdce9e8b1823c23e + version: 5c9d6a0e13f7a0eb50e305de30793551958890cc libboundscheck: remote_url: https://gitee.com/src-openeuler/libboundscheck.git version: 7ffcd596b083b464e60ae59eaabfe3e6f82053a0 @@ -797,7 +797,7 @@ manifest_list: version: 9a8b85c3bbd12f92b2f60bce78e90e0704fc7921 libogg: remote_url: https://gitee.com/src-openeuler/libogg.git - version: 4541713ab2d7f47f75ed21c42914a12e144bf853 + version: 2a510b090c152b033d43d46f92b91e3d6ecc0937 libpcap: remote_url: https://gitee.com/src-openeuler/libpcap.git version: 7f96009de3da35064f32b4648bb1d0d4cb505357 @@ -809,7 +809,7 @@ manifest_list: version: 894443bf11fd9361e63f154d92d6c01bb22093f2 libpwquality: remote_url: https://gitee.com/src-openeuler/libpwquality.git - version: 659e1cac750cf45f5cdfc4afe231eb3e96dd65a7 + version: fd187d00929289c1d930b1b6563dff83b60a0537 librepo: remote_url: https://gitee.com/src-openeuler/librepo.git version: dee4679beafbabc573a0543bb85d45d27d15aa03 @@ -818,7 +818,7 @@ manifest_list: version: cd956459b96e405dff4a4155f92d1944f130a673 libseccomp: remote_url: https://gitee.com/src-openeuler/libseccomp.git - version: 14ac05d08e028a8769e78dc5b6c56552eaa43a80 + version: 40cce6781bdb410e4a5ca47bfc33f94b724ce752 libselinux: remote_url: https://gitee.com/src-openeuler/libselinux.git version: 2348cc687f87fb933be48a91b7127c75874d5aa5 @@ -986,7 +986,7 @@ manifest_list: version: 01bcdcb57f4960e5210d5b132d44bfc65b41c476 meson: remote_url: https://gitee.com/src-openeuler/meson.git - version: eb7ddaa9d616edd9213967d1edf2e76c4830b057 + version: 3381bb6f53c42dd0de8676fe8a2112ae6727b011 message-filters: remote_url: https://gitee.com/src-openeuler/message_filters.git version: a7830e4e950e7931ba7e1756784d6316dcef5673 @@ -1007,7 +1007,7 @@ manifest_list: version: 48992f21a953d8c0720b93ed98fb5f2ea40f84a5 nasm: remote_url: https://gitee.com/src-openeuler/nasm.git - version: e8f11304d13859972ca586f66e1fc8e132c15a7b + version: 07b72bf8ecbd4cce03b52812ac7e132ddd1fd741 navigation2: remote_url: https://gitee.com/src-openeuler/navigation2.git version: 055b7023116b5a37cff387e4a3fdb396c86045b6 @@ -1061,7 +1061,7 @@ manifest_list: version: fd34c4ef7f35f8451d3203132d8f13400be2b87a openssl: remote_url: https://gitee.com/src-openeuler/openssl.git - version: fe3837c2cfc7e4b63a0a9310dd29cbf1fc4afeee + version: aeaaede904df0f278a23ddabf52b71b5a5e15174 orc: remote_url: https://gitee.com/src-openeuler/orc.git version: 10791eb57d0b51ceffe434d9947f32efc827e22a @@ -1148,7 +1148,7 @@ manifest_list: version: 2260c02de06921af19a601f339d9cb26b1d5ae69 popt: remote_url: https://gitee.com/src-openeuler/popt.git - version: 000f128a298609e880661fdd5998d6a4dd798044 + version: d14ab4d4698770f1a49d30e9df86858174be1d8e powertop: remote_url: https://gitee.com/src-openeuler/powertop.git version: bb2d64d406aebaea72cd7dfc9e719faf11c45fc2 @@ -1430,7 +1430,7 @@ manifest_list: version: e7982134da4045463d63a3f94ccc685abc5028a3 quota: remote_url: https://gitee.com/src-openeuler/quota.git - version: 35f9c43662d52a23df8bad5bbe09f103729c1f60 + version: 6f829023a9f3f4b11962126c62acbafb04b9fe2c raspberrypi-bluetooth: remote_url: https://gitee.com/src-openeuler/raspberrypi-bluetooth.git version: 21d9a9a008c54d72dbdd356852d6cfa80f5fe518 @@ -1451,7 +1451,7 @@ manifest_list: version: d5249a62739a60017da7db4d5c489675b92b7ea5 rclpy: remote_url: https://gitee.com/src-openeuler/rclpy.git - version: 860977c811a6fc1d09674993578793d857e8b83f + version: 4d9e9730f49168e4509d17f0cd1bd0d06c83434c rcpputils: remote_url: https://gitee.com/src-openeuler/rcpputils.git version: 568e3af236d589658a106a143b592f1193afce35 @@ -1550,7 +1550,7 @@ manifest_list: version: efbd72f7254a4cd0fd1833b7ec287ba1a8adaca7 rpcbind: remote_url: https://gitee.com/src-openeuler/rpcbind.git - version: 6a34adaa73768dfddf22ff6a00dc343f712fe80c + version: 93663fdb2e14a10b3570a59a78f10e5bb8330039 rpcsvc-proto: remote_url: https://gitee.com/src-openeuler/rpcsvc-proto.git version: 30d4b6d37d5eb19d658bef47ba4265a031c842d2 @@ -1718,7 +1718,7 @@ manifest_list: version: 1370aeba6969b893018bd157b49aa2c64e7fe2da tzdata: remote_url: https://gitee.com/src-openeuler/tzdata.git - version: 386c90f5f0b0ce7eda81c334b9cb3508272f9557 + version: d188efd9e8596a18e67a2ad7217e5c298758f4b8 trusted-firmware-a: remote_url: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git version: 5b986f0188e1b785a35d6c40f8a95c58887227fd @@ -1748,7 +1748,7 @@ manifest_list: version: 41b47213777373b98d22ed93e3941fb8c2aa05c1 util-linux: remote_url: https://gitee.com/src-openeuler/util-linux.git - version: 4a9d2e828f9fb4ab1ccd75d2a71e355ce8631ee5 + version: 0f88790229a8450f47f260031ec2f564f56d3572 util-macros: remote_url: https://gitee.com/src-openeuler/xorg-x11-util-macros.git version: c8b86724c81d31460b474aa978294a4f912dce20 @@ -1886,7 +1886,7 @@ manifest_list: version: 64c318ba078b800451428297b3081978ea273477 zlib: remote_url: https://gitee.com/src-openeuler/zlib.git - version: 20d8ac9247f71d5a05a10a8d508e89f69636fc26 + version: 4b426a2b0de77d73b71baf70888e61ec4ff49bb1 zstd: remote_url: https://gitee.com/src-openeuler/zstd.git version: 1bd03ae8e15c88c9bad864c65fa6b3998f3fa07f diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend index 8a2be1e3a3c..069cc2bf0c4 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend @@ -12,6 +12,7 @@ SRC_URI =+ " \ file://modify-pwquality_conf.patch \ file://fix-password-similarity.patch \ file://fix-doc-about-difok.patch \ + file://backport-Make-maxclassrepeat-1-behavior-consistent-with-docs.patch \ " # do not enable python bindings, as well as not use gettext to translate diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-test/googletest/googletest_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-test/googletest/googletest_%.bbappend index 15523d82f53..d14fbba017b 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-test/googletest/googletest_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-test/googletest/googletest_%.bbappend @@ -28,3 +28,4 @@ CXXFLAGS:append = " -fPIC" # if we are not building shared libraries # RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG","shared","","${PN}-staticdev",d)}" +SRC_URI[sha256sum] = "8ad4a4d328dce9226a23158420548f4dcb4303edd2cd4068e03d1385701d9080" diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/rclpy/rclpy_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/rclpy/rclpy_%.bbappend index 4ad8794f929..51d9fd566e2 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/rclpy/rclpy_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/rclpy/rclpy_%.bbappend @@ -8,3 +8,4 @@ do_install:append() { } INSANE_SKIP:${PN} += "already-stripped" +SRC_URI[sha256sum] = "6f685bf6eba43ac21f6dcfad35142f76d4aab519c791572a82433e4fe0f35f16" diff --git a/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend b/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend index 930ba0328f7..49790735176 100644 --- a/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend +++ b/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend @@ -35,8 +35,24 @@ SRC_URI:prepend = "file://${BP}.tar.gz \ file://Backport-Add-NULL-checks-where-ContentInfo-data-can-be-NULL.patch \ file://Backport-Fix-SM4-XTS-aarch64-assembly-implementation-bug.patch \ file://fix-add-loongarch64-target.patch \ + file://backport-CVE-2024-2511-Fix-unconstrained-session-cache-growth-in-TLSv1.3.patch \ + file://backport-Add-a-test-for-session-cache-handling.patch \ + file://backport-Extend-the-multi_resume-test-for-simultaneous-resump.patch \ + file://backport-Hardening-around-not_resumable-sessions.patch \ + file://backport-Add-a-test-for-session-cache-overflow.patch \ + file://backport-CVE-2024-4603-Check-DSA-parameters-for-exce.patch \ + file://Backport-Add-a-test-for-late-loading-of-an-ENGINE-in-TLS.patch \ + file://Backport-Don-t-attempt-to-set-provider-params-on-an-ENGINE-ba.patch \ + file://Backport-CVE-2024-4741-Only-free-the-read-buffers-if-we-re-not-using-them.patch \ + file://Backport-CVE-2024-4741-Set-rlayer.packet-to-NULL-after-we-ve-finished-using.patch \ + file://Backport-CVE-2024-4741-Extend-the-SSL_free_buffers-testing.patch \ + file://Backport-CVE-2024-4741-Move-the-ability-to-load-the-dasync-engine-into-sslt.patch \ + file://Backport-CVE-2024-4741-Further-extend-the-SSL_free_buffers-testing.patch \ + file://Backport-bn-Properly-error-out-if-aliasing-return-value-with-.patch \ + file://Backport-CVE-2024-5535-Fix-SSL_select_next_proto.patch \ + file://Backport-CVE-2024-5535-Add-a-test-for-ALPN-and-NPN.patch \ " do_install:append () { #Remove the empty directory that conflict with ca-certificates. rm -rf ${D}${sysconfdir}/ssl/certs -} \ No newline at end of file +} diff --git a/meta-openeuler/recipes-core/busybox/busybox_%.bbappend b/meta-openeuler/recipes-core/busybox/busybox_%.bbappend index 432ac3cd4e4..7a1a42f3762 100644 --- a/meta-openeuler/recipes-core/busybox/busybox_%.bbappend +++ b/meta-openeuler/recipes-core/busybox/busybox_%.bbappend @@ -25,6 +25,7 @@ SRC_URI:append = " \ file://${BP}.tar.bz2 \ file://backport-CVE-2022-28391.patch \ file://backport-CVE-2022-48174.patch \ + file://backport-CVE-2023-42363.patch \ file://init.cfg \ file://rcS.default \ file://mdev.cfg \ diff --git a/meta-openeuler/recipes-core/libseccomp/libseccomp_%.bbappend b/meta-openeuler/recipes-core/libseccomp/libseccomp_%.bbappend index cf4c5c4abae..2d2e9469521 100644 --- a/meta-openeuler/recipes-core/libseccomp/libseccomp_%.bbappend +++ b/meta-openeuler/recipes-core/libseccomp/libseccomp_%.bbappend @@ -7,6 +7,7 @@ SRC_URI:prepend = " \ file://backport-arch-disambiguate-in-arch-syscall-validate.patch \ file://Add-64-bit-LoongArch-support.patch \ file://fix-build-error-for-libseccomp.patch \ + file://fix_undefined_behavior_in_scmp_bpf_sim.patch \ " S = "${WORKDIR}/${BP}" diff --git a/meta-openeuler/recipes-core/tzdata/timezone-append.inc b/meta-openeuler/recipes-core/tzdata/timezone-append.inc index a0dc3339875..9577d798c75 100644 --- a/meta-openeuler/recipes-core/tzdata/timezone-append.inc +++ b/meta-openeuler/recipes-core/tzdata/timezone-append.inc @@ -18,6 +18,8 @@ SRC_URI = " \ file://remove-El_Aaiun-timezone.patch \ file://remove-Israel-timezone.patch \ file://skip-check_web-testcase.patch \ + file://Asia-Almaty-matches-Asia-Tashkent-from-now-on.patch \ + file://America-Scoresbysund-matches-America-Nuuk-from-now-o.patch \ " SRC_URI[tzcode.sha256sum] = "80072894adff5a458f1d143e16e4ca1d8b2a122c9c5399da482cb68cba6a1ff8" 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 b1c8ffe460f..73e6b91ef69 100644 --- a/meta-openeuler/recipes-core/util-linux/util-linux-common.inc +++ b/meta-openeuler/recipes-core/util-linux/util-linux-common.inc @@ -37,5 +37,4 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=12ae7768a65ec8f2e44d930df9cb43fa file://libfdisk/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ " - -SRC_URI[sha256sum] = "890ae8ff810247bd19e274df76e8371d202cda01ad277681b0ea88eeaa00286b" +SRC_URI[sha256sum] = "d23d0a22e716ccc42b4526715416bf222c276c36b41c1deec462b13a1cac6e78" diff --git a/meta-openeuler/recipes-core/zlib/zlib_%.bbappend b/meta-openeuler/recipes-core/zlib/zlib_%.bbappend index 20885f34d81..7273439c282 100644 --- a/meta-openeuler/recipes-core/zlib/zlib_%.bbappend +++ b/meta-openeuler/recipes-core/zlib/zlib_%.bbappend @@ -1,13 +1,13 @@ #main bbfile: yocto-poky/meta/recipes-core/zlib/zlib_1.2.11.bb #version in openEuler -PV = "1.3.1" +PV = "1.2.13" # files, patches that come from openeuler SRC_URI = " \ file://${BP}.tar.xz \ file://backport-zlib-1.2.5-minizip-fixuncrypt.patch \ - file://backport-fix-undefined-buffer-detected-by-oss-fuzz.patch \ + file://backport-CVE-2023-45853.patch \ " # files, patches that come from openeuler for aarch64, there are compile err in 0004-zlib-Optimize-CRC32.patch, not apply diff --git a/meta-openeuler/recipes-devtools/gdb/gdb-src.inc b/meta-openeuler/recipes-devtools/gdb/gdb-src.inc index 82bbb1640b7..fdcb470f4b4 100644 --- a/meta-openeuler/recipes-devtools/gdb/gdb-src.inc +++ b/meta-openeuler/recipes-devtools/gdb/gdb-src.inc @@ -98,3 +98,4 @@ do_install:append:riscv64() { rm -rf ${D}/usr/lib64 } +SRC_URI[sha256sum] = "f11df3194f99d6eda173a342646b131c1dfabd19fc49813c39b9b7de19fc734a" diff --git a/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend b/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend index be72d0f76f1..8d655197d3a 100644 --- a/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend +++ b/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend @@ -9,6 +9,6 @@ SRC_URI:prepend = " \ " SRC_URI[md5sum] = "6d724389b0a08c519d9dd6e2fac7efb8" -SRC_URI[sha256sum] = "024d302a3aadcbf9f78735320a6d5aedf8b77876c8ac8bbb95081ca55054c7eb" +SRC_URI[sha256sum] = "10c69b3cb5851f8bde67264ff7d8d679abe310441789e78d4b8225d0d9b09504" S = "${WORKDIR}/json-c-json-c-${PV}" diff --git a/meta-openeuler/recipes-devtools/meson/files/0001-Make-CPU-family-warnings-fatal.patch b/meta-openeuler/recipes-devtools/meson/files/0001-Make-CPU-family-warnings-fatal.patch index 848dccfbe72..04397255d5e 100644 --- a/meta-openeuler/recipes-devtools/meson/files/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta-openeuler/recipes-devtools/meson/files/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 Mon Sep 17 00:00:00 2001 +From b77cbe67df5fa0998946503f207c256ee740bb5f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal @@ -7,15 +7,15 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ross Burton --- - mesonbuild/envconfig.py | 2 +- - mesonbuild/environment.py | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) + mesonbuild/envconfig.py | 4 ++-- + mesonbuild/environment.py | 6 ++---- + 2 files changed, 4 insertions(+), 6 deletions(-) -Index: meson-0.60.2/mesonbuild/envconfig.py -=================================================================== ---- meson-0.60.2.orig/mesonbuild/envconfig.py -+++ meson-0.60.2/mesonbuild/envconfig.py -@@ -266,8 +266,8 @@ class MachineInfo(HoldableObject): +diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py +index 07f1229..a35c356 100644 +--- a/mesonbuild/envconfig.py ++++ b/mesonbuild/envconfig.py +@@ -285,8 +285,8 @@ class MachineInfo(HoldableObject): 'but is missing {}.'.format(minimum_literal - set(literal))) cpu_family = literal['cpu_family'] @@ -26,13 +26,13 @@ Index: meson-0.60.2/mesonbuild/envconfig.py endian = literal['endian'] if endian not in ('little', 'big'): -Index: meson-0.60.2/mesonbuild/environment.py -=================================================================== ---- meson-0.60.2.orig/mesonbuild/environment.py -+++ meson-0.60.2/mesonbuild/environment.py -@@ -354,10 +354,8 @@ def detect_cpu_family(compilers: Compile - if any_compiler_has_define(compilers, '__64BIT__'): - trial = 'ppc64' +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index 2ba2054..d798e3b 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -359,10 +359,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: + if compilers and not any_compiler_has_define(compilers, '__mips64'): + trial = 'mips' - if trial not in known_cpu_families: - mlog.warning(f'Unknown CPU family {trial!r}, please report this at ' @@ -42,4 +42,3 @@ Index: meson-0.60.2/mesonbuild/environment.py + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) return trial - diff --git a/meta-openeuler/recipes-devtools/meson/files/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta-openeuler/recipes-devtools/meson/files/0001-python-module-do-not-manipulate-the-environment-when.patch index 19502fa9cd8..2e0a4b1bbe6 100644 --- a/meta-openeuler/recipes-devtools/meson/files/0001-python-module-do-not-manipulate-the-environment-when.patch +++ b/meta-openeuler/recipes-devtools/meson/files/0001-python-module-do-not-manipulate-the-environment-when.patch @@ -1,4 +1,4 @@ -From a97dba12cff6c4c9181909141a1a9f38d7c900bf Mon Sep 17 00:00:00 2001 +From e85683698aa3556bf14fc6d35f2c067f16af520b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 19 Nov 2018 14:24:26 +0100 Subject: [PATCH] python module: do not manipulate the environment when calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py -index 14386f9..118a15f 100644 +index 9aea6bd..8c13ede 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py -@@ -354,9 +354,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -380,9 +380,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', empty.name = 'python' return empty @@ -25,7 +25,7 @@ index 14386f9..118a15f 100644 try: return PythonPkgConfigDependency(name, env, kwargs, installation, True) finally: -@@ -365,8 +362,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -391,8 +388,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', os.environ[name] = value elif name in os.environ: del os.environ[name] diff --git a/meta-openeuler/recipes-devtools/meson/files/0002-Support-building-allarch-recipes-again.patch b/meta-openeuler/recipes-devtools/meson/files/0002-Support-building-allarch-recipes-again.patch index dcc1ce9c27a..a8396f30bbe 100644 --- a/meta-openeuler/recipes-devtools/meson/files/0002-Support-building-allarch-recipes-again.patch +++ b/meta-openeuler/recipes-devtools/meson/files/0002-Support-building-allarch-recipes-again.patch @@ -1,21 +1,22 @@ -From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00 2001 +From 6fb8db54929b40e1fd7ac949ef44f0d37df0bae9 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 -Subject: [PATCH 2/2] Support building allarch recipes again +Subject: [PATCH] Support building allarch recipes again This registers "allarch" as a known CPU family. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Peter Kjellerstedt + --- mesonbuild/envconfig.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 4d58c91..ff01ad1 100644 +index a35c356..436355f 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -36,6 +36,7 @@ from pathlib import Path +@@ -38,6 +38,7 @@ from pathlib import Path known_cpu_families = ( @@ -23,6 +24,3 @@ index 4d58c91..ff01ad1 100644 'aarch64', 'alpha', 'arc', --- -2.24.0 - diff --git a/meta-openeuler/recipes-devtools/meson/meson_%.bbappend b/meta-openeuler/recipes-devtools/meson/meson_%.bbappend index 05df293bf3a..127d0205e0a 100644 --- a/meta-openeuler/recipes-devtools/meson/meson_%.bbappend +++ b/meta-openeuler/recipes-devtools/meson/meson_%.bbappend @@ -1,4 +1,11 @@ -PV = "1.1.1" +PV = "1.3.1" -SRC_URI:prepend = "file://${BP}.tar.gz \ +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" +SRC_URI = "file://${PV}.tar.gz \ + file://meson-setup.py \ + file://meson-wrapper \ + file://0001-python-module-do-not-manipulate-the-environment-when.patch \ + file://0001-Make-CPU-family-warnings-fatal.patch \ + file://0002-Support-building-allarch-recipes-again.patch \ " +SRC_URI[sha256sum] = "6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7" diff --git a/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend b/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend index 4698326bcac..94f55c8bbdf 100644 --- a/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend +++ b/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend @@ -1,14 +1,13 @@ # main bbfile: yocto-poky/meta/recipes-devtools/nasm/nasm_2.15.05.bb -PV = "2.16.01" +PV = "2.16.03" # upstream patches update FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}/:" -SRC_URI:remove = "file://CVE-2022-44370.patch" - # files, patches that come from openeuler -SRC_URI:prepend = "file://${BP}.tar.xz \ +SRC_URI = "file://${BP}.tar.xz \ file://enable-make-check.patch \ file://fix-help-info-error.patch \ " +SRC_URI[sha256sum] = "bef3de159bcd61adf98bb7cc87ee9046e944644ad76b7633f18ab063edb29e57" diff --git a/meta-openeuler/recipes-extended/quota/quota_%.bbappend b/meta-openeuler/recipes-extended/quota/quota_%.bbappend index 9b413d0ceb3..fa12faec982 100644 --- a/meta-openeuler/recipes-extended/quota/quota_%.bbappend +++ b/meta-openeuler/recipes-extended/quota/quota_%.bbappend @@ -16,6 +16,7 @@ SRC_URI += " \ file://0002-quotaio_xfs-Warn-when-large-kernel-timestamps-cannot.patch \ file://0004-quota_nld-Initialize-sa_mask-when-registering-PID-fi.patch \ file://0005-quota-nld-fix-open-PID-file-failed-when-systemd-read.patch \ + file://0006-common.c-fix-strncat-usage.patch \ " SRC_URI[tarball.md5sum] = "aef94648438832b684978d46fdf75110" diff --git a/meta-openeuler/recipes-multimedia/libogg/libogg_%.bbappend b/meta-openeuler/recipes-multimedia/libogg/libogg_%.bbappend index e3d7249ff6a..7ef80836e59 100644 --- a/meta-openeuler/recipes-multimedia/libogg/libogg_%.bbappend +++ b/meta-openeuler/recipes-multimedia/libogg/libogg_%.bbappend @@ -5,4 +5,4 @@ PV = "1.3.5" SRC_URI:prepend = " file://${BP}.tar.xz " SRC_URI[md5sum] = "3178c98341559657a15b185bf5d700a5" -SRC_URI[sha256sum] = "c4d91be36fc8e54deae7575241e03f4211eb102afb3fc0775fbbc1b740016705" +SRC_URI[sha256sum] = "2ab280022897c4927b1347d023df22631ed76cf9e6d9f029d9c9d4cf4764fe3f" diff --git a/meta-openeuler/recipes-support/acl/acl_%.bbappend b/meta-openeuler/recipes-support/acl/acl_%.bbappend index 8bd2c293900..3a7bdd62cc8 100644 --- a/meta-openeuler/recipes-support/acl/acl_%.bbappend +++ b/meta-openeuler/recipes-support/acl/acl_%.bbappend @@ -1,11 +1,13 @@ # main bbfile: yocto-poky/meta/recipes-support/attr/acl_2.2.53.bb # acl version in openEuler -PV = "2.3.1" +PV = "2.3.2" -SRC_URI:prepend = "file://${BP}.tar.gz " +SRC_URI = "file://${BP}.tar.xz \ + file://backport-acl_copy_entry-Prevent-accidental-NULL-pointer-deref.patch \ +" # because PV is different, the md5 and sha256 should also be updated SRC_URI[md5sum] = "3cecb80cb0a52a0b273e6698ba642263" -SRC_URI[sha256sum] = "760c61c68901b37fdd5eefeeaf4c0c7a26bdfdd8ac747a1edff1ce0e243c11af" +SRC_URI[sha256sum] = "5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c" diff --git a/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend b/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend index 03de601562c..c359e033670 100644 --- a/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend +++ b/meta-openeuler/recipes-support/libatomic-ops/libatomic-ops_%.bbappend @@ -9,5 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ # apply src and patch from openEuler SRC_URI:prepend = "file://libatomic_ops-${PV}.tar.gz \ - file://0001-add-sw_64-support.patch \ - " + file://0001-add-sw_64-support.patch \ + " +SRC_URI[sha256sum] = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51" diff --git a/meta-openeuler/recipes-support/popt/popt_%.bbappend b/meta-openeuler/recipes-support/popt/popt_%.bbappend index afae1260705..75f8ec43e7d 100644 --- a/meta-openeuler/recipes-support/popt/popt_%.bbappend +++ b/meta-openeuler/recipes-support/popt/popt_%.bbappend @@ -15,5 +15,5 @@ SRC_URI:prepend = "file://${BP}.tar.gz \ " SRC_URI[md5sum] = "eaa2135fddb6eb03f2c87ee1823e5a78" -SRC_URI[sha256sum] = "c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9" +SRC_URI[sha256sum] = "bef3de159bcd61adf98bb7cc87ee9046e944644ad76b7633f18ab063edb29e57" LIC_FILES_CHKSUM = "file://COPYING;md5=e0206ac9471d06667e076212db20c5f4" -- Gitee