diff --git a/meta-openeuler/recipes-core/attr/attr.inc b/meta-openeuler/recipes-core/attr/attr.inc index 442273d669da35265fbfd0b05d20250a094036b9..134710da259b0f6a6bd0f809ac8036f25ac40bc1 100644 --- a/meta-openeuler/recipes-core/attr/attr.inc +++ b/meta-openeuler/recipes-core/attr/attr.inc @@ -16,11 +16,12 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ SRC_URI = "file://attr/attr-${PV}.tar.gz \ file://attr/0001-bypass-wrong-output-when-enabled-selinux.patch \ + file://attr/0002-dont-skip-security.evm-when-copy-xattr.patch \ file://run-ptest \ " #inherit ptest update-alternatives autotools gettext -inherit autotools gettext +inherit autotools gettext ptest PACKAGES =+ "lib${BPN}" diff --git a/meta-openeuler/recipes-core/cracklib/cracklib_2.9.7.bb b/meta-openeuler/recipes-core/cracklib/cracklib_2.9.7.bb index 204d0ed2b549aff7c1f624fbdacb455bdf2229d6..a4515badd7517cd78804ad69b79ea95dc8772fd3 100644 --- a/meta-openeuler/recipes-core/cracklib/cracklib_2.9.7.bb +++ b/meta-openeuler/recipes-core/cracklib/cracklib_2.9.7.bb @@ -3,7 +3,10 @@ HOMEPAGE = "http://sourceforge.net/projects/cracklib" LICENSE = "LGPLv2.1+" -SRC_URI = "file://cracklib/cracklib-${PV}.tar.gz" +SRC_URI = "file://cracklib/cracklib-${PV}.tar.gz \ + file://cracklib/fix-problem-of-error-message-about-simplistic-passwo.patch \ + file://cracklib/backport-cracklib-2.9.6-lookup.patch \ +" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" diff --git a/meta-openeuler/recipes-core/dhcp/dhcp.inc b/meta-openeuler/recipes-core/dhcp/dhcp.inc index 483d7aa2fa557e6ded96f8148fd2dffb51c8909e..7613d0b678ef65bd621099d7c0e6b2aa3cd849f6 100644 --- a/meta-openeuler/recipes-core/dhcp/dhcp.inc +++ b/meta-openeuler/recipes-core/dhcp/dhcp.inc @@ -46,6 +46,10 @@ SRC_URI = "file://dhcp/${BP}.tar.gz \ file://dhcp/backport-CVE-2021-25217.patch \ file://dhcp/fix-multiple-definition-with-gcc-10-1.patch \ file://dhcp/fix-multiple-definition-with-gcc-10-2.patch \ + file://dhcp/fix-coredump-when-client-active-is-NULL.patch \ + file://dhcp/bugfix-error-message-display.patch \ + file://dhcp/feature-lease-time-config-ipv6.patch \ + file://dhcp/add-a-test-case-to-parse-code93-in-option_unittest.patch \ file://0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch \ file://0013-fixup_use_libbind.patch \ file://init-server file://default-server \ diff --git a/meta-openeuler/recipes-core/e2fsprogs/e2fsprogs.inc b/meta-openeuler/recipes-core/e2fsprogs/e2fsprogs.inc index aed06a00f08a27e87bdca4567b80c64e00e886a6..b1a15e3a89d9ef4828518156c128b103887525fe 100644 --- a/meta-openeuler/recipes-core/e2fsprogs/e2fsprogs.inc +++ b/meta-openeuler/recipes-core/e2fsprogs/e2fsprogs.inc @@ -19,7 +19,18 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \ SECTION = "base" DEPENDS = "util-linux attr" -SRC_URI = "file://e2fsprogs/${BP}.tar.xz" +SRC_URI = "file://e2fsprogs/${BP}.tar.xz \ + file://e2fsprogs/0001-e2fsprogs-set-hugefile-from-4T-to-1T-in-hugefile-tes.patch \ + file://e2fsprogs/0002-libss-add-newer-libreadline.so.8-to-dlopen-path.patch \ + file://e2fsprogs/0003-tests-update-expect-files-for-f_mmp_garbage.patch \ + file://e2fsprogs/0004-tests-update-expect-files-for-f_large_dir-and-f_larg.patch \ + file://e2fsprogs/0005-resize2fs-resize2fs-disk-hardlinks-will-be-error.patch \ + file://e2fsprogs/0006-e2fsck-exit-journal-recovery-when-find-EIO-ENOMEM-er.patch \ + file://e2fsprogs/0007-e2fsck-exit-journal-recovery-when-jounral-superblock.patch \ + file://e2fsprogs/0008-e2fsck-add-env-param-E2FS_UNRELIABLE_IO-to-fi.patch \ + file://e2fsprogs/0009-e2mmpstatus.8.in-detele-filesystem-can-be-UUID-or-LA.patch \ + file://run-ptest \ +" inherit autotools gettext texinfo pkgconfig multilib_header ptest diff --git a/meta-openeuler/recipes-core/e2fsprogs/e2fsprogs_1.46.4.bb b/meta-openeuler/recipes-core/e2fsprogs/e2fsprogs_1.46.4.bb index 29b317af440b7ef8bc5b684731b21f47b93c3f67..7cd217861e60e9a8aa519bb9de7701e0c38a0fb9 100644 --- a/meta-openeuler/recipes-core/e2fsprogs/e2fsprogs_1.46.4.bb +++ b/meta-openeuler/recipes-core/e2fsprogs/e2fsprogs_1.46.4.bb @@ -1,12 +1,5 @@ require e2fsprogs.inc -SRC_URI += "file://e2fsprogs/0001-e2fsprogs-set-hugefile-from-4T-to-1T-in-hugefile-tes.patch \ - file://e2fsprogs/0002-libss-add-newer-libreadline.so.8-to-dlopen-path.patch \ - file://e2fsprogs/0003-tests-update-expect-files-for-f_mmp_garbage.patch \ - file://e2fsprogs/0004-tests-update-expect-files-for-f_large_dir-and-f_larg.patch \ - file://run-ptest \ -" - UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+(\.\d+)*)$" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ diff --git a/meta-openeuler/recipes-core/expat/expat_2.4.1.bb b/meta-openeuler/recipes-core/expat/expat_2.4.1.bb index d396fb4191da025d825b79753dfdfc0a4a5869ed..bed0d95b0f2c285d6861368a1fe4bc4aabe03708 100644 --- a/meta-openeuler/recipes-core/expat/expat_2.4.1.bb +++ b/meta-openeuler/recipes-core/expat/expat_2.4.1.bb @@ -7,6 +7,25 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9" SRC_URI = "file://expat/expat-${PV}.tar.gz \ + file://expat/backport-CVE-2021-45960.patch \ + file://expat/backport-CVE-2021-46143.patch \ + file://expat/backport-CVE-2022-22822-CVE-2022-22823-CVE-2022-22824-CVE-2022-22825-CVE-2022-22826-CVE-2022-22827.patch \ + file://expat/backport-CVE-2022-23852-lib-Detect-and-prevent-integer-overflow-in-XML_GetBu.patch \ + file://expat/backport-CVE-2022-23852-tests-Cover-integer-overflow-in-XML_GetBuffer-CVE-20.patch \ + file://expat/backport-CVE-2022-23990-lib-Prevent-integer-overflow-in-doProlog-CVE-2022-23.patch \ + file://expat/backport-CVE-2022-25235-lib-Add-missing-validation-of-encoding.patch \ + file://expat/backport-tests-Cover-missing-validation-of-encoding.patch \ + file://expat/backport-CVE-2022-25236-lib-Protect-against-malicious-namespace-declarations.patch \ + file://expat/backport-tests-Cover-CVE-2022-25236.patch \ + file://expat/backport-CVE-2022-25313-Prevent-stack-exhaustion-in-build_model.patch \ + file://expat/backport-CVE-2022-25314-Prevent-integer-overflow-in-copyString.patch \ + file://expat/backport-CVE-2022-25315-Prevent-integer-overflow-in-storeRawNames.patch \ + file://expat/backport-Fix-build_model-regression.patch \ + file://expat/backport-tests-Protect-against-nested-element-declaration-mod.patch \ + file://expat/backport-lib-Fix-harmless-use-of-uninitialized-memory.patch \ + file://expat/backport-lib-Drop-unused-macro-UTF8_GET_NAMING.patch \ + file://expat/backport-lib-Relax-fix-to-CVE-2022-25236-with-regard-to-RFC-3.patch \ + file://expat/backport-tests-Cover-relaxed-fix-to-CVE-2022-25236.patch \ file://libtool-tag.patch \ file://run-ptest \ " diff --git a/meta-openeuler/recipes-core/grep/grep_3.7.bb b/meta-openeuler/recipes-core/grep/grep_3.7.bb index 22786d6f1bd4e487c2d1a14a940efcccd14968f1..ed3dcb511e15b62d22ad30d8671e71fc7464456a 100644 --- a/meta-openeuler/recipes-core/grep/grep_3.7.bb +++ b/meta-openeuler/recipes-core/grep/grep_3.7.bb @@ -6,7 +6,9 @@ SECTION = "console/utils" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -SRC_URI = "file://grep/grep-${PV}.tar.xz" +SRC_URI = "file://grep/grep-${PV}.tar.xz \ + file://grep/backport-grep-avoid-sticky-problem-with-f-f.patch \ +" SRC_URI[sha256sum] = "5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c" inherit autotools gettext texinfo pkgconfig diff --git a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.11.bb b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.11.bb index a43d39ed8285263ccabcbc556164208f446c225c..25c3da73a65bc11f6b76755d86cecfd59ad87cc3 100644 --- a/meta-openeuler/recipes-core/iSulad/iSulad_2.0.11.bb +++ b/meta-openeuler/recipes-core/iSulad/iSulad_2.0.11.bb @@ -4,7 +4,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "file://iSulad/v${PV}.tar.gz \ - " + file://iSulad/0001-iSulad-Add-the-function-of-isolating-the-user-namesp.patch \ + file://iSulad/0002-let-isulad-root-path-configable-when-userns-remap.patch \ +" S = "${WORKDIR}/${BPN}-v${PV}" WARN_QA_remove += "uppercase-pn" diff --git a/meta-openeuler/recipes-core/iptables/iptables_1.8.7.bb b/meta-openeuler/recipes-core/iptables/iptables_1.8.7.bb index b2e7e2a20a4c438e919722893ac4711a59f507f8..a2fe0666ddc490941870208b96be8482c2d2794d 100644 --- a/meta-openeuler/recipes-core/iptables/iptables_1.8.7.bb +++ b/meta-openeuler/recipes-core/iptables/iptables_1.8.7.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://iptables/iptables.c;beginline=13;endline=25;md5=c5cffd09974558cf27d0f763df2a12dc \ " SRC_URI = "file://iptables/iptables-${PV}.tar.bz2 \ + file://iptables/bugfix-add-check-fw-in-entry.patch \ file://iptables.service \ file://iptables.rules \ file://ip6tables.service \ diff --git a/meta-openeuler/recipes-core/lcr/lcr_2.0.7.bb b/meta-openeuler/recipes-core/lcr/lcr_2.0.7.bb index 54464295490057866f2e1240730ec23bb9cd960c..00dedc84583d2c491f7e31174cca4fa4adc31895 100644 --- a/meta-openeuler/recipes-core/lcr/lcr_2.0.7.bb +++ b/meta-openeuler/recipes-core/lcr/lcr_2.0.7.bb @@ -15,7 +15,8 @@ inherit cmake ### Build metadata SRC_URI = "file://lcr/v${PV}.tar.gz \ - " + file://lcr/0001-parse-userns-remap-in-daemmon.json.patch \ +" S = "${WORKDIR}/${BPN}-v${PV}" diff --git a/meta-openeuler/recipes-core/libpwquality/libpwquality_1.4.4.bb b/meta-openeuler/recipes-core/libpwquality/libpwquality_1.4.4.bb index 81159f65dd6e9e748c62b2e751fd65fe6d73becf..71f88f5a16cd41092852d61b04180b23f5033364 100644 --- a/meta-openeuler/recipes-core/libpwquality/libpwquality_1.4.4.bb +++ b/meta-openeuler/recipes-core/libpwquality/libpwquality_1.4.4.bb @@ -7,16 +7,15 @@ PARALLEL_MAKE = "-j 1" LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2" -SRC_URI += "file://libpwquality/libpwquality-1.4.4.tar.bz2" - -#S = "${WORKDIR}/${SRCNAME}-${PV}" +SRC_URI = "file://libpwquality/${BP}.tar.bz2 \ + file://libpwquality/modify-pwquality_conf.patch \ + file://libpwquality/fix-password-similarity.patch \ +" DEPENDS = "cracklib" inherit autotools gettext -#B = "${S}" - export PYTHON_DIR export BUILD_SYS export HOST_SYS diff --git a/meta-openeuler/recipes-core/nfs-utils/nfs-utils_2.5.4.bb b/meta-openeuler/recipes-core/nfs-utils/nfs-utils_2.5.4.bb index 6b51b6ad7c380493b57ab218f0a8caa578282572..daad3bf2e84f84c86afd67b578026b858d98628e 100644 --- a/meta-openeuler/recipes-core/nfs-utils/nfs-utils_2.5.4.bb +++ b/meta-openeuler/recipes-core/nfs-utils/nfs-utils_2.5.4.bb @@ -19,6 +19,9 @@ USERADD_PARAM_${PN}-client = "--system --home-dir /var/lib/nfs \ SRC_URI = "file://nfs-utils/${BP}.tar.xz \ file://nfs-utils/0000-systemd-idmapd-require-rpc-pipefs.patch \ file://nfs-utils/0001-correct-the-statd-path-in-man.patch \ + file://nfs-utils/0002-nfs-utils-set-use-gss-proxy-1-to-enable-gss-proxy-by.patch \ + file://nfs-utils/0003-idmapd-Fix-error-status-when-nfs-idmapd-exits.patch \ + file://nfs-utils/0004-fix-coredump-in-bl_add_disk.patch \ file://nfsserver \ file://nfscommon \ file://nfs-utils.conf \ diff --git a/meta-openeuler/recipes-core/procps/procps_3.3.17.bb b/meta-openeuler/recipes-core/procps/procps_3.3.17.bb index b69f59c97449e2f4ef213e9fa7967a6aa96e55fe..bdd1a910d618d1a237a6f7e9d9ab7ce75828cdd9 100644 --- a/meta-openeuler/recipes-core/procps/procps_3.3.17.bb +++ b/meta-openeuler/recipes-core/procps/procps_3.3.17.bb @@ -17,6 +17,7 @@ SRC_URI = "file://procps-ng/procps-ng-${PV}.tar.xz \ file://procps-ng/0002-top-In-the-bye_bye-function-replace-fputs-with-the-w.patch \ file://procps-ng/0003-add-options-M-and-N-for-top.patch \ file://procps-ng/0004-top-exit-with-error-when-pid-overflow.patch \ + file://procps-ng/0005-fix-a-fix-for-the-bye_bye-function.patch \ file://sysctl.conf \ " SRC_URI[sha256sum] = "4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4" diff --git a/meta-openeuler/recipes-core/rpcbind/rpcbind_1.2.6.bb b/meta-openeuler/recipes-core/rpcbind/rpcbind_1.2.6.bb index 978fd3e83756358f99c65c67b6931e5ab640deda..85a5b065cf07d674de9c6eb026898e1a38ae245a 100644 --- a/meta-openeuler/recipes-core/rpcbind/rpcbind_1.2.6.bb +++ b/meta-openeuler/recipes-core/rpcbind/rpcbind_1.2.6.bb @@ -15,7 +15,9 @@ SRC_URI = "file://rpcbind/${BP}.tar.bz2 \ file://rpcbind/rpcbind-0.2.4-runstatdir.patch \ file://rpcbind/rpcbind-0.2.4-systemd-service.patch \ file://rpcbind/rpcbind-0.2.4-systemd-rundir.patch \ + file://rpcbind/bugfix-rpcbind-GETADDR-return-client-ip.patch \ file://rpcbind/CVE-2017-8779.patch \ + file://rpcbind/backport-fix-double-free-in-init_transport.patch \ file://rpcbind/bugfix-listen-tcp-port-111.patch \ file://init.d \ file://rpcbind.conf \ diff --git a/meta-openeuler/recipes-core/shadow/shadow.inc b/meta-openeuler/recipes-core/shadow/shadow.inc index d04590639473cec01f91cb1c4f835cef9d6faed6..3228fe9ab9a8d3242f16bb85b90138ef3f9df9f6 100644 --- a/meta-openeuler/recipes-core/shadow/shadow.inc +++ b/meta-openeuler/recipes-core/shadow/shadow.inc @@ -11,7 +11,6 @@ UPSTREAM_CHECK_URI = "https://github.com/shadow-maint/shadow/releases" FILESEXTRAPATHS_prepend .= "${OPEN_SRC_DIR}/shadow-utils:" inherit autotools gettext -#inherit autotools export CONFIG_SHELL="/bin/sh" @@ -89,6 +88,7 @@ SRC_URI = "file://shadow/${BP}.tar.xz \ file://shadow/newgrp-fix-segmentation-fault.patch \ file://shadow/groupdel-fix-SIGSEGV-when-passwd-does-not-exist.patch \ file://shadow/shadow-add-sm3-crypt-support.patch \ + file://shadow/backport-useradd-modify-check-ID-range-for-system-users.patch \ " LIC_FILES_CHKSUM="file://COPYING;md5=ed80ff1c2b40843cf5768e5229cf16e5" diff --git a/meta-openeuler/recipes-core/shadow/shadow_4.9.bb b/meta-openeuler/recipes-core/shadow/shadow_4.9.bb index b02a26b4697798f5b1c8b8cde3d7f4d7bae0a6d8..d5d644ad814c08ce11c1cb5ef79a0ce43705956c 100644 --- a/meta-openeuler/recipes-core/shadow/shadow_4.9.bb +++ b/meta-openeuler/recipes-core/shadow/shadow_4.9.bb @@ -5,6 +5,3 @@ require shadow.inc #BUILD_LDFLAGS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-lcrypt', '', d)}" BBCLASSEXTEND = "native nativesdk" - - - diff --git a/meta-openeuler/recipes-core/util-linux/util-linux.inc b/meta-openeuler/recipes-core/util-linux/util-linux.inc index 13ea7e18b7d80d9b5df1a74393787df69cdcba10..09fe0d8a61d88cc3cb96d8b16d47afe0e80f5a36 100644 --- a/meta-openeuler/recipes-core/util-linux/util-linux.inc +++ b/meta-openeuler/recipes-core/util-linux/util-linux.inc @@ -28,6 +28,15 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da FILESEXTRAPATHS_prepend := "${THISDIR}/util-linux:" MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "file://util-linux/util-linux-${PV}.tar.xz \ + file://util-linux/2.36-login-lastlog-create.patch \ + file://util-linux/backport-CVE-2021-3995.patch \ + file://util-linux/backport-CVE-2021-3996.patch \ + file://util-linux/realloc-buffer-when-header-size-changed.patch \ + file://util-linux/fix-size-use-for-stdin.patch \ + file://util-linux/segmentation-fault-on-invalid-unicode-input-passed-to-s-option.patch \ + file://util-linux/backport-fix-by-ignoring-EINVAL-on-remount-of-proc.patch \ + file://util-linux/Add-check-to-resolve-uname26-version-test-failed.patch \ + file://util-linux/SKIPPED-no-root-permissions-test.patch \ file://runuser.pamd \ file://runuser-l.pamd \ " diff --git a/meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb b/meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb index ac8d8f6c61cddffed13eed57c96ba520b6e09628..d4ee7b6563c8ef217e46f23b72a7d6171d63ee94 100644 --- a/meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb +++ b/meta-openeuler/recipes-core/yajl/yajl_2.1.0.bb @@ -3,12 +3,13 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI = "file://yajl/2.1.0.tar.gz \ +SRC_URI = "file://yajl/${PV}.tar.gz \ file://yajl/yajl-2.1.0-pkgconfig-location.patch \ file://yajl/yajl-2.1.0-pkgconfig-includedir.patch \ file://yajl/yajl-2.1.0-test-location.patch \ file://yajl/yajl-2.1.0-dynlink-binaries.patch \ file://yajl/yajl-2.1.0-fix-memory-leak.patch \ + file://yajl/backport-fix-memory-leaks.patch \ " S = "${WORKDIR}/${BPN}-${PV}" diff --git a/meta-openeuler/recipes-devtools/binutils/binutils-2.37.inc b/meta-openeuler/recipes-devtools/binutils/binutils-2.37.inc index 85b7ef21575dab932c8c92d976849e2de10c1d71..bc67ef9a0169a513a431dd50e13f0c49299d8a01 100644 --- a/meta-openeuler/recipes-devtools/binutils/binutils-2.37.inc +++ b/meta-openeuler/recipes-devtools/binutils/binutils-2.37.inc @@ -20,13 +20,17 @@ PV = "2.37" CVE_VERSION = "2.37" SRC_URI = "file://binutils/${BP}.tar.xz \ - file://binutils/backport-CVE-2021-45078.patch \ - file://binutils/binutils-2.20.51.0.2-libtool-lib64.patch \ - file://binutils/binutils-2.22.52.0.4-no-config-h-check.patch \ - file://binutils/CVE-2019-1010204.patch \ - file://binutils/binutils-2.27-aarch64-ifunc.patch \ - file://binutils/export-demangle.h-in-devel-package.patch \ - file://binutils/Fix-a-potential-use-of-an-uninitialised-value-in-the.patch \ + file://binutils/binutils-2.20.51.0.2-libtool-lib64.patch \ + file://binutils/export-demangle.h-in-devel-package.patch \ + file://binutils/binutils-2.22.52.0.4-no-config-h-check.patch \ + file://binutils/binutils-2.27-aarch64-ifunc.patch \ + file://binutils/CVE-2019-1010204.patch \ + file://binutils/Fix-a-potential-use-of-an-uninitialised-value-in-the.patch \ + file://binutils/backport-CVE-2021-45078.patch \ + file://binutils/backport-0001-CVE-2021-42574.patch \ + file://binutils/backport-0002-CVE-2021-42574.patch \ + file://binutils/backport-0003-CVE-2021-42574.patch \ + file://binutils/bfd-Close-the-file-descriptor-if-there-is-no-archive.patch \ file://0005-Point-scripts-location-to-libdir.patch \ " diff --git a/meta-openeuler/recipes-devtools/elfutils/elfutils_0.185.bb b/meta-openeuler/recipes-devtools/elfutils/elfutils_0.185.bb index d320650a2ab996e31325aa28246e1e13c19477f7..9a4ab39a415609195f0720da5c46093690a3894f 100644 --- a/meta-openeuler/recipes-devtools/elfutils/elfutils_0.185.bb +++ b/meta-openeuler/recipes-devtools/elfutils/elfutils_0.185.bb @@ -11,6 +11,7 @@ DEPENDS_append_libc-musl = " argp-standalone fts musl-obstack " # The Debian patches below are from: # http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz SRC_URI = "file://elfutils/${BP}.tar.bz2 \ + file://elfutils/eu-elfclassify-no-stdin-should-use-classify_flag_no_stdin.patch \ file://run-ptest \ " diff --git a/meta-openeuler/recipes-devtools/squashfs-tools/squashfs-tools/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch b/meta-openeuler/recipes-devtools/squashfs-tools/squashfs-tools/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch new file mode 100644 index 0000000000000000000000000000000000000000..bb3f6960554368ed2d85e8b80ce52450a150ea1e --- /dev/null +++ b/meta-openeuler/recipes-devtools/squashfs-tools/squashfs-tools/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch @@ -0,0 +1,35 @@ +From f5c908e92d4c055859be2fddbda266d9e3bfd415 Mon Sep 17 00:00:00 2001 +From: Patrick McCarty +Date: Mon, 26 Jul 2021 11:38:43 -0700 +Subject: [PATCH] Avoid use of INSTALL_DIR for symlink targets + +In case INSTALL_DIR is overridden with a staged install location, using +INSTALL_DIR for the symlink target path prefix will yield an incorrect location +for the final installation. + +Because the symlink itself is already installed to INSTALL_DIR, simply removing +the INSTALL_DIR prefix suffices as a fix. + +Note that using $DESTDIR/$INSTALL_DIR where appropriate can avoid this type of +issue, but that can be considered a future enhancement. + +Signed-off-by: Patrick McCarty +--- + squashfs-tools/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile +index f5a55f1..7262a2e 100755 +--- a/squashfs-tools/Makefile ++++ b/squashfs-tools/Makefile +@@ -406,5 +406,5 @@ install: mksquashfs unsquashfs + mkdir -p $(INSTALL_DIR) + cp mksquashfs $(INSTALL_DIR) + cp unsquashfs $(INSTALL_DIR) +- ln -fs $(INSTALL_DIR)/unsquashfs $(INSTALL_DIR)/sqfscat +- ln -fs $(INSTALL_DIR)/mksquashfs $(INSTALL_DIR)/sqfstar ++ ln -fs unsquashfs $(INSTALL_DIR)/sqfscat ++ ln -fs mksquashfs $(INSTALL_DIR)/sqfstar +-- +2.30.0 + diff --git a/meta-openeuler/recipes-devtools/squashfs-tools/squashfs-tools_4.5.bb b/meta-openeuler/recipes-devtools/squashfs-tools/squashfs-tools_4.5.bb index 53a1060e17bb3638690c04fcd539dae8ce5e88cc..2b6a1cd25a5f9726a813e971f87fdd4e168c0d42 100644 --- a/meta-openeuler/recipes-devtools/squashfs-tools/squashfs-tools_4.5.bb +++ b/meta-openeuler/recipes-devtools/squashfs-tools/squashfs-tools_4.5.bb @@ -13,6 +13,7 @@ SRC_URI = "file://squashfs-tools/squashfs4.5.tar.gz \ file://squashfs-tools/0003-CVE-2021-41072.patch \ file://squashfs-tools/0004-CVE-2021-41072.patch \ file://squashfs-tools/0005-CVE-2021-41072.patch \ + file://0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch \ " S = "${WORKDIR}/${BP}" diff --git a/meta-openeuler/recipes-kernel/kexec/kexec-tools_2.0.23.bb b/meta-openeuler/recipes-kernel/kexec/kexec-tools_2.0.23.bb index 43f8c93a0aff8203813a2c3a7891b85d525b7035..922514a497c7931e89d4c80cdec0796e61d0cec1 100644 --- a/meta-openeuler/recipes-kernel/kexec/kexec-tools_2.0.23.bb +++ b/meta-openeuler/recipes-kernel/kexec/kexec-tools_2.0.23.bb @@ -12,6 +12,7 @@ SRC_URI = "file://kexec-tools/kexec-tools-${PV}.tar.xz \ file://kexec-tools/arm64-support-more-than-one-crash-kernel-regions.patch \ file://kexec-tools/kexec-Add-quick-kexec-support.patch \ file://kexec-tools/kexec-Quick-kexec-implementation-for-arm64.patch \ + file://kexec-tools/arm64-crashdump-deduce-paddr-of-_text-based-on-kerne.patch \ file://kdump \ file://kdump.conf \ file://kdump.service \ diff --git a/meta-openeuler/recipes-labtools/ncurses/ncurses_6.2.bb b/meta-openeuler/recipes-labtools/ncurses/ncurses_6.3.bb similarity index 54% rename from meta-openeuler/recipes-labtools/ncurses/ncurses_6.2.bb rename to meta-openeuler/recipes-labtools/ncurses/ncurses_6.3.bb index 28cb1402f52d3e06f86acc0ced020505c271e12c..873557a4c8eb578cd3dccd614f12884a22c92fdd 100644 --- a/meta-openeuler/recipes-labtools/ncurses/ncurses_6.2.bb +++ b/meta-openeuler/recipes-labtools/ncurses/ncurses_6.3.bb @@ -1,7 +1,12 @@ require ncurses.inc FILESEXTRAPATHS_append := "${THISDIR}/../../../../meta/recipes-core/ncurses/files/:" -LIC_FILES_CHKSUM="file://COPYING;md5=910e05334f7e0b7631da6b4ebb1e1aab" -SRC_URI = "file://ncurses/ncurses-6.2.tar.gz" +LIC_FILES_CHKSUM="file://COPYING;md5=f852913c5d988a5f5a2f1df7ba7ee893" +SRC_URI = "file://ncurses/${BP}.tar.gz \ + file://ncurses/ncurses-config.patch \ + file://ncurses/ncurses-libs.patch \ + file://ncurses/ncurses-urxvt.patch \ + file://ncurses/ncurses-kbs.patch \ +" CFLAGS_remove_arm64eb += "-O2" CXXFLAGS_remove_arm64eb += "-O2"