diff --git a/meta-openeuler/recipes-core/grep/grep_3.6.bb b/meta-openeuler/recipes-core/grep/grep_3.7.bb similarity index 85% rename from meta-openeuler/recipes-core/grep/grep_3.6.bb rename to meta-openeuler/recipes-core/grep/grep_3.7.bb index ee27996f1d6f66c588947ad993defaa145fa5179..22786d6f1bd4e487c2d1a14a940efcccd14968f1 100644 --- a/meta-openeuler/recipes-core/grep/grep_3.6.bb +++ b/meta-openeuler/recipes-core/grep/grep_3.7.bb @@ -6,11 +6,8 @@ SECTION = "console/utils" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -SRC_URI = "file://grep/grep-${PV}.tar.xz \ -" -#file://grep/grep-3.6-gnulib-c-stack-fix.patch - -SRC_URI[sha256sum] = "667e15e8afe189e93f9f21a7cd3a7b3f776202f417330b248c2ad4f997d9373e" +SRC_URI = "file://grep/grep-${PV}.tar.xz" +SRC_URI[sha256sum] = "5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c" inherit autotools gettext texinfo pkgconfig @@ -33,8 +30,6 @@ do_install () { fi } -#inherit update-alternatives - PACKAGECONFIG ??= "pcre" PACKAGECONFIG[pcre] = "--enable-perl-regexp,--disable-perl-regexp,libpcre" diff --git a/meta-openeuler/recipes-core/gzip/gzip-1.10/wrong-path-fix.patch b/meta-openeuler/recipes-core/gzip/gzip/wrong-path-fix.patch similarity index 100% rename from meta-openeuler/recipes-core/gzip/gzip-1.10/wrong-path-fix.patch rename to meta-openeuler/recipes-core/gzip/gzip/wrong-path-fix.patch diff --git a/meta-openeuler/recipes-core/gzip/gzip_1.10.bb b/meta-openeuler/recipes-core/gzip/gzip_1.11.bb similarity index 86% rename from meta-openeuler/recipes-core/gzip/gzip_1.10.bb rename to meta-openeuler/recipes-core/gzip/gzip_1.11.bb index 151fb48ad9931d1a82319f77f0b0dc5ddf7d78e3..3e93b0aeb671d5648d44b7072c4503501b5a38bc 100644 --- a/meta-openeuler/recipes-core/gzip/gzip_1.10.bb +++ b/meta-openeuler/recipes-core/gzip/gzip_1.11.bb @@ -2,9 +2,8 @@ require gzip.inc LICENSE = "GPLv3+" -SRC_URI = "file://gzip/gzip-${PV}.tar.xz \ +SRC_URI = "file://gzip/${BP}.tar.xz \ file://gzip/fix-verbose-disable.patch \ - file://gzip/gzexe.patch \ file://run-ptest \ " #file://gzip/performance-neoncrc32-and-prfm.patch @@ -39,5 +38,5 @@ do_install_ptest() { ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile } -SRC_URI[md5sum] = "cf9ee51aff167ff69844d5d7d71c8b20" -SRC_URI[sha256sum] = "c91f74430bf7bc20402e1f657d0b252cb80aa66ba333a25704512af346633c68" +SRC_URI[md5sum] = "d1e93996dba00cab0caa7903cd01d454" +SRC_URI[sha256sum] = "9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907" diff --git a/meta-openeuler/recipes-core/less/less_563.bb b/meta-openeuler/recipes-core/less/less_590.bb similarity index 51% rename from meta-openeuler/recipes-core/less/less_563.bb rename to meta-openeuler/recipes-core/less/less_590.bb index a9490e5c0d5f2160636250ea001887d90a1ecb76..2f65a251b26fdcbc8e83782ab806d8b813f999aa 100644 --- a/meta-openeuler/recipes-core/less/less_563.bb +++ b/meta-openeuler/recipes-core/less/less_590.bb @@ -26,26 +26,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ DEPENDS = "ncurses" SRC_URI = "file://${BPN}/${BPN}-${PV}.tar.gz \ - file://${BPN}/backport-Create-only-one-ifile-when-a-file-is-opened-under-di.patch \ - file://${BPN}/backport-Fix-crash-when-call-set_ifilename-with-a-pointer-to-.patch \ - file://${BPN}/backport-Fix-minor-memory-leak-with-input-preprocessor.-150.patch \ - file://${BPN}/backport-Fix-Tag-not-found-error-while-looking-for-a-tag-s-lo.patch \ - file://${BPN}/backport-Ignore-SIGTSTP-in-secure-mode.patch \ - file://${BPN}/backport-Lesskey-don-t-translate-ctrl-K-in-an-EXTRA-string.patch \ - file://${BPN}/backport-Make-histpattern-return-negative-value-to-indicate-e.patch \ - file://${BPN}/backport-Protect-from-buffer-overrun.patch \ - file://${BPN}/backport-Remove-extraneous-frees-associated-with-removed-call.patch \ - file://${BPN}/backport-Remove-unnecessary-call-to-pshift-in-pappend.patch \ - file://${BPN}/backport-Reset-horizontal-shift-when-opening-a-new-file.patch \ file://${BPN}/less-394-time.patch \ " -#file://${BPN}/less-418-fsync.patch - -SRC_URI[sha256sum] = "ce5b6d2b9fc4442d7a07c93ab128d2dff2ce09a1d4f2d055b95cf28dd0dc9a9a" +SRC_URI[sha256sum] = "6aadf54be8bf57d0e2999a3c5d67b1de63808bb90deb8f77b028eafae3a08e10" UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html" -#inherit autotools update-alternatives inherit autotools do_install () { diff --git a/meta-openeuler/recipes-core/libpcre/libpcre_8.44.bb b/meta-openeuler/recipes-core/libpcre/libpcre_8.45.bb similarity index 92% rename from meta-openeuler/recipes-core/libpcre/libpcre_8.44.bb rename to meta-openeuler/recipes-core/libpcre/libpcre_8.45.bb index 402992b4a3debd23b56d2da909a01370991a1ff7..a83d9c6c63fee19525819ce39064b22d9502b02f 100644 --- a/meta-openeuler/recipes-core/libpcre/libpcre_8.44.bb +++ b/meta-openeuler/recipes-core/libpcre/libpcre_8.45.bb @@ -6,14 +6,14 @@ SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e" +LIC_FILES_CHKSUM = "file://LICENCE;md5=b5d5d1a69a24ea2718263f1ff85a1c58" SRC_URI = "file://pcre/pcre-${PV}.tar.bz2 \ file://run-ptest \ file://Makefile \ " -SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24" -SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d" +SRC_URI[md5sum] = "4452288e6a0eefb2ab11d36010a1eebb" +SRC_URI[sha256sum] = "4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8" CVE_PRODUCT = "pcre" diff --git a/meta-openeuler/recipes-kernel/kexec/kexec-tools_2.0.20.bb b/meta-openeuler/recipes-kernel/kexec/kexec-tools_2.0.23.bb similarity index 61% rename from meta-openeuler/recipes-kernel/kexec/kexec-tools_2.0.20.bb rename to meta-openeuler/recipes-kernel/kexec/kexec-tools_2.0.23.bb index e8cc09d3cc794a49db2ca015256aada0ef0453a7..43f8c93a0aff8203813a2c3a7891b85d525b7035 100644 --- a/meta-openeuler/recipes-kernel/kexec/kexec-tools_2.0.20.bb +++ b/meta-openeuler/recipes-kernel/kexec/kexec-tools_2.0.23.bb @@ -9,38 +9,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \ DEPENDS = "zlib" SRC_URI = "file://kexec-tools/kexec-tools-${PV}.tar.xz \ - file://kexec-tools/kexec-tools-2.0.20-fix-broken-multiboot2-buliding-for-i386.patch \ - file://kexec-tools/kexec-tools-2.0.20-Remove-duplicated-variable-declarations.patch \ - file://kexec-tools/kexec-add-variant-helper-functions-for-handling-memory-regions.patch \ - file://kexec-tools/arm64-kexec-allocate-memory-space-avoiding-reserved-regions.patch \ - file://kexec-tools/x86-Fix-PAGE_OFFSET-for-kernels-since-4.20.patch \ - file://kexec-tools/Cleanup-remove-the-read_elf_kcore.patch \ - file://kexec-tools/Fix-an-error-definition-about-the-variable-fname.patch \ - file://kexec-tools/Cleanup-move-it-back-from-util_lib-elf_info.c.patch \ - file://kexec-tools/Limit-the-size-of-vmcore-dmesg.txt-to-2G.patch \ - file://kexec-tools/vmcore-dmesg-vmcore-dmesg.c-Fix-shifting-error-reported-by-cppcheck.patch \ - file://kexec-tools/kexec-tools-Fix-possible-out-of-bounds-access-in-ifdown.patch \ - file://kexec-tools/kexec-tools-Fix-kexec_file_load-2-error-handling.patch \ - file://kexec-tools/kexec-tools-Reset-getopt-before-falling-back-to-legacy.patch \ - file://kexec-tools/kexec-support-parsing-the-string-Reserved-to-get-the-correct-e820-reserved-region.patch \ - file://kexec-tools/arm64-kdump-deal-with-a-lot-of-resource-entries-in-proc-iomem.patch \ -" -SRC_URI_append_aarch64 += " \ file://kexec-tools/arm64-support-more-than-one-crash-kernel-regions.patch \ -" -SRC_URI_append += " \ file://kexec-tools/kexec-Add-quick-kexec-support.patch \ -" -SRC_URI_append_aarch64 += " \ file://kexec-tools/kexec-Quick-kexec-implementation-for-arm64.patch \ + file://kdump \ + file://kdump.conf \ + file://kdump.service \ " -SRC_URI_append += " \ - file://kexec-tools/backport-print-add-support-for-lockless-ringbuffer.patch \ - file://kdump \ - file://kdump.conf \ - file://kdump.service \ -" -SRC_URI[sha256sum] = "dad8077f0315445d1f6335579fc4ade222facf82a67124974c7be5303ba4f8c8" +SRC_URI[sha256sum] = "aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b" inherit autotools