From 2d8d6ec229fd6f8ec01c72f7c49c84ea3ea7064a Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Wed, 13 Aug 2025 20:50:07 +0200 Subject: 7zip: upgrade 24.09 -> 25.01 Handles CVEs: * 25.00: CVE-2025-53816, CVE-2025-53817 * 25.01: CVE-2025-55188 License-Update: copyright years refreshed Signed-off-by: Peter Marko Signed-off-by: Khem Raj --- meta-oe/recipes-extended/7zip/7zip_24.09.bb | 76 ---------------------------- meta-oe/recipes-extended/7zip/7zip_25.01.bb | 77 +++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 76 deletions(-) delete mode 100644 meta-oe/recipes-extended/7zip/7zip_24.09.bb create mode 100644 meta-oe/recipes-extended/7zip/7zip_25.01.bb (limited to 'meta-oe/recipes-extended/7zip') diff --git a/meta-oe/recipes-extended/7zip/7zip_24.09.bb b/meta-oe/recipes-extended/7zip/7zip_24.09.bb deleted file mode 100644 index 74e44c44e3..0000000000 --- a/meta-oe/recipes-extended/7zip/7zip_24.09.bb +++ /dev/null @@ -1,76 +0,0 @@ -SUMMARY = "7-zip is a commandline utility handling 7z archives." -HOMEPAGE = "http://www.7-zip.org/" -LICENSE = "LGPL-2.1-or-later & unRAR & PD & BSD-2-Clause & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://DOC/copying.txt;md5=4fbd65380cdd255951079008b364516c \ - file://DOC/unRarLicense.txt;md5=9c87ddde469ef94aed153b0951d088de \ - file://DOC/License.txt;md5=44483e232b64ffca25fe001f3d6418d0" - -CVE_PRODUCT = "7-zip 7zip" -SRC_URI = "git://github.com/ip7z/7zip.git;protocol=https;branch=main \ - file://0001-support-yocto-cross-compiling.patch \ - file://7z_wrapper.sh \ - " -SRCREV = "e5431fa6f5505e385c6f9367260717e9c47dc2ee" - -UPSTREAM_CHECK_URI = "https://github.com/ip7z/7zip/releases/latest" - - -# Support Yocto cross compiling -CXXFLAGS:append:toolchain-clang = " -Wno-error=cast-qual -Wno-error=sign-conversion \ - -Wno-error=disabled-macro-expansion \ - -Wno-error=shorten-64-to-32 \ - -Wno-error=cast-function-type-strict" - -EXTRA_OEMAKE += " \ - CXXFLAGS_EXTRA='${CXXFLAGS}' \ - CFLAGS_BASE2='${CFLAGS}' \ - LDFLAGS_STATIC_3='${LDFLAGS}' \ -" - -# Support clang -MAKEFILE ?= "../../cmpl_gcc.mak" -MAKEFILE:class-target:toolchain-clang = "../../cmpl_clang.mak" - -do_compile() { - oe_runmake -C CPP/7zip/Bundles/Alone2 -f ${MAKEFILE} - oe_runmake -C CPP/7zip/Bundles/Format7zF -f ${MAKEFILE} - oe_runmake -C CPP/7zip/UI/Console -f ${MAKEFILE} - oe_runmake -C CPP/7zip/Bundles/SFXCon -f ${MAKEFILE} - oe_runmake -C CPP/7zip/Bundles/Alone -f ${MAKEFILE} - oe_runmake -C CPP/7zip/Bundles/Alone7z -f ${MAKEFILE} -} - -FILES:${PN} += "${libdir}/*" - -FILES_SOLIBSDEV = "" -INSANE_SKIP:${PN} += "dev-so" - -INSTALLDIR ?= "g" -INSTALLDIR:class-target:toolchain-clang = "c" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/CPP/7zip/Bundles/Alone/b/${INSTALLDIR}/7za ${D}${bindir} - install -m 0755 ${S}/CPP/7zip/Bundles/Alone7z/b/${INSTALLDIR}/7zr ${D}${bindir} - install -m 0755 ${S}/CPP/7zip/UI/Console/b/${INSTALLDIR}/7z ${D}${bindir}/7z.real - install -m 0755 ${UNPACKDIR}/7z_wrapper.sh ${D}${bindir}/7z - - install -d ${D}${libdir} - install -m 0755 ${S}/CPP/7zip/Bundles/Format7zF/b/${INSTALLDIR}/7z.so ${D}${libdir}/lib7z.so - ln -rsn ${D}${libdir}/lib7z.so ${D}${bindir}/7z.so - - # install headers (for development) and readme (for version information) - for header_file in $(find ${S}/CPP/${BPN} ${S}/CPP/Common ${S}/C -name "*.h"); do - header_dir=$(dirname $(echo $header_file | sed "s|${S}/||")) - install -d ${D}${includedir}/${BPN}/$header_dir - install -m 0644 $header_file ${D}${includedir}/${BPN}/$header_dir - done - install -d ${D}${includedir}/${BPN}/DOC - install -m 0644 ${S}/DOC/readme.txt ${D}${includedir}/${BPN}/DOC -} - -PROVIDES += "p7zip" -RPROVIDES:${PN} += "lib7z.so()(64bit) 7z lib7z.so p7zip" -RPROVIDES:${PN}-dev += "lib7z.so()(64bit) 7z lib7z.so" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-extended/7zip/7zip_25.01.bb b/meta-oe/recipes-extended/7zip/7zip_25.01.bb new file mode 100644 index 0000000000..779b708eee --- /dev/null +++ b/meta-oe/recipes-extended/7zip/7zip_25.01.bb @@ -0,0 +1,77 @@ +SUMMARY = "7-zip is a commandline utility handling 7z archives." +HOMEPAGE = "http://www.7-zip.org/" +LICENSE = "LGPL-2.1-or-later & unRAR & PD & BSD-2-Clause & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://DOC/copying.txt;md5=4fbd65380cdd255951079008b364516c \ + file://DOC/unRarLicense.txt;md5=9c87ddde469ef94aed153b0951d088de \ + file://DOC/License.txt;md5=e80f9280df93aa8da95cac449f9fd115 \ + " + +CVE_PRODUCT = "7-zip 7zip" +SRC_URI = "git://github.com/ip7z/7zip.git;protocol=https;branch=main \ + file://0001-support-yocto-cross-compiling.patch \ + file://7z_wrapper.sh \ + " +SRCREV = "5e96a8279489832924056b1fa82f29d5837c9469" + +UPSTREAM_CHECK_URI = "https://github.com/ip7z/7zip/releases/latest" + + +# Support Yocto cross compiling +CXXFLAGS:append:toolchain-clang = " -Wno-error=cast-qual -Wno-error=sign-conversion \ + -Wno-error=disabled-macro-expansion \ + -Wno-error=shorten-64-to-32 \ + -Wno-error=cast-function-type-strict" + +EXTRA_OEMAKE += " \ + CXXFLAGS_EXTRA='${CXXFLAGS}' \ + CFLAGS_BASE2='${CFLAGS}' \ + LDFLAGS_STATIC_3='${LDFLAGS}' \ +" + +# Support clang +MAKEFILE ?= "../../cmpl_gcc.mak" +MAKEFILE:class-target:toolchain-clang = "../../cmpl_clang.mak" + +do_compile() { + oe_runmake -C CPP/7zip/Bundles/Alone2 -f ${MAKEFILE} + oe_runmake -C CPP/7zip/Bundles/Format7zF -f ${MAKEFILE} + oe_runmake -C CPP/7zip/UI/Console -f ${MAKEFILE} + oe_runmake -C CPP/7zip/Bundles/SFXCon -f ${MAKEFILE} + oe_runmake -C CPP/7zip/Bundles/Alone -f ${MAKEFILE} + oe_runmake -C CPP/7zip/Bundles/Alone7z -f ${MAKEFILE} +} + +FILES:${PN} += "${libdir}/*" + +FILES_SOLIBSDEV = "" +INSANE_SKIP:${PN} += "dev-so" + +INSTALLDIR ?= "g" +INSTALLDIR:class-target:toolchain-clang = "c" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/CPP/7zip/Bundles/Alone/b/${INSTALLDIR}/7za ${D}${bindir} + install -m 0755 ${S}/CPP/7zip/Bundles/Alone7z/b/${INSTALLDIR}/7zr ${D}${bindir} + install -m 0755 ${S}/CPP/7zip/UI/Console/b/${INSTALLDIR}/7z ${D}${bindir}/7z.real + install -m 0755 ${UNPACKDIR}/7z_wrapper.sh ${D}${bindir}/7z + + install -d ${D}${libdir} + install -m 0755 ${S}/CPP/7zip/Bundles/Format7zF/b/${INSTALLDIR}/7z.so ${D}${libdir}/lib7z.so + ln -rsn ${D}${libdir}/lib7z.so ${D}${bindir}/7z.so + + # install headers (for development) and readme (for version information) + for header_file in $(find ${S}/CPP/${BPN} ${S}/CPP/Common ${S}/C -name "*.h"); do + header_dir=$(dirname $(echo $header_file | sed "s|${S}/||")) + install -d ${D}${includedir}/${BPN}/$header_dir + install -m 0644 $header_file ${D}${includedir}/${BPN}/$header_dir + done + install -d ${D}${includedir}/${BPN}/DOC + install -m 0644 ${S}/DOC/readme.txt ${D}${includedir}/${BPN}/DOC +} + +PROVIDES += "p7zip" +RPROVIDES:${PN} += "lib7z.so()(64bit) 7z lib7z.so p7zip" +RPROVIDES:${PN}-dev += "lib7z.so()(64bit) 7z lib7z.so" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf