From c3b895e94301f23181d1f87e8013867920587cd9 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 15 Feb 2024 13:54:05 -0500 Subject: zlib: upgrade 1.3 -> 1.3.1 Refresh local patch. Changelog: https://github.com/madler/zlib/releases/tag/v1.3.1 (From OE-Core rev: 186475e244d9622817b5a50e83cbfe1e4ed78e34) Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- ...0001-configure-Pass-LDFLAGS-to-link-tests.patch | 22 +++++----- meta/recipes-core/zlib/zlib_1.3.1.bb | 50 ++++++++++++++++++++++ meta/recipes-core/zlib/zlib_1.3.bb | 50 ---------------------- 3 files changed, 60 insertions(+), 62 deletions(-) create mode 100644 meta/recipes-core/zlib/zlib_1.3.1.bb delete mode 100644 meta/recipes-core/zlib/zlib_1.3.bb (limited to 'meta/recipes-core/zlib') diff --git a/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch b/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch index e6cc915ba5..07b2cd3879 100644 --- a/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch +++ b/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch @@ -1,7 +1,7 @@ Upstream-Status: Submitted [https://github.com/madler/zlib/pull/599] Signed-off-by: Ross Burton -From f15584918a7fbbe3cc794ad59100e5e8153ea9f6 Mon Sep 17 00:00:00 2001 +From ea77f1f003a4d18b23cca703f3c824942863a1b4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 8 Mar 2022 22:38:47 -0800 Subject: [PATCH] configure: Pass LDFLAGS to link tests @@ -13,24 +13,25 @@ tests perform correctly. Without this some tests may fail resulting in wrong confgure result, ending in miscompiling the package Signed-off-by: Khem Raj + --- configure | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure -index 52ff4a0..d04ee59 100755 +index c55098a..a7c6d72 100755 --- a/configure +++ b/configure -@@ -427,7 +427,7 @@ if test $shared -eq 1; then +@@ -443,7 +443,7 @@ if test $shared -eq 1; then echo Checking for shared library support... | tee -a configure.log # we must test in two steps (cc then ld), required at least on SunOS 4.x - if try $CC -w -c $SFLAGS $test.c && + if try $CC -c $SFLAGS $test.c && - try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then + try $LDSHARED $SFLAGS $LDFLAGS -o $test$shared_ext $test.o; then echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log elif test -z "$old_cc" -a -z "$old_cflags"; then echo No shared library support. | tee -a configure.log -@@ -503,7 +503,7 @@ int main(void) { +@@ -505,7 +505,7 @@ int main(void) { } EOF fi @@ -39,7 +40,7 @@ index 52ff4a0..d04ee59 100755 sizet=`./$test` echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}" -@@ -537,7 +537,7 @@ int main(void) { +@@ -539,7 +539,7 @@ int main(void) { return 0; } EOF @@ -48,7 +49,7 @@ index 52ff4a0..d04ee59 100755 echo "Checking for fseeko... Yes." | tee -a configure.log else CFLAGS="${CFLAGS} -DNO_FSEEKO" -@@ -554,7 +554,7 @@ cat > $test.c < $test.c < int main() { return strlen(strerror(errno)); } EOF @@ -57,7 +58,7 @@ index 52ff4a0..d04ee59 100755 echo "Checking for strerror... Yes." | tee -a configure.log else CFLAGS="${CFLAGS} -DNO_STRERROR" -@@ -661,7 +661,7 @@ int main() +@@ -663,7 +663,7 @@ int main() return (mytest("Hello%d\n", 1)); } EOF @@ -66,7 +67,7 @@ index 52ff4a0..d04ee59 100755 echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log echo >> configure.log -@@ -751,7 +751,7 @@ int main() +@@ -753,7 +753,7 @@ int main() } EOF @@ -75,6 +76,3 @@ index 52ff4a0..d04ee59 100755 echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log echo >> configure.log --- -2.25.1 - diff --git a/meta/recipes-core/zlib/zlib_1.3.1.bb b/meta/recipes-core/zlib/zlib_1.3.1.bb new file mode 100644 index 0000000000..e6a81ef789 --- /dev/null +++ b/meta/recipes-core/zlib/zlib_1.3.1.bb @@ -0,0 +1,50 @@ +SUMMARY = "Zlib Compression Library" +DESCRIPTION = "Zlib is a general-purpose, patent-free, lossless data compression \ +library which is used by many different programs." +HOMEPAGE = "http://zlib.net/" +SECTION = "libs" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0" + +# The source tarball needs to be .gz as only the .gz ends up in fossils/ +SRC_URI = "https://zlib.net/${BP}.tar.gz \ + file://0001-configure-Pass-LDFLAGS-to-link-tests.patch \ + file://run-ptest \ + " +UPSTREAM_CHECK_URI = "http://zlib.net/" + +SRC_URI[sha256sum] = "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23" + +# When a new release is made the previous release is moved to fossils/, so add this +# to PREMIRRORS so it is also searched automatically. +PREMIRRORS:append = " https://zlib.net/ https://zlib.net/fossils/" + +CFLAGS += "-D_REENTRANT" + +RDEPENDS:${PN}-ptest += "make" + +inherit ptest + +B = "${WORKDIR}/build" + +do_configure() { + LDCONFIG=true ${S}/configure --prefix=${prefix} --shared --libdir=${libdir} --uname=GNU +} +do_configure[cleandirs] += "${B}" + +do_compile() { + oe_runmake shared +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +do_install_ptest() { + install ${B}/examplesh ${D}${PTEST_PATH} +} + +BBCLASSEXTEND = "native nativesdk" + +CVE_STATUS[CVE-2023-45853] = "not-applicable-config: we don't build minizip" +CVE_STATUS[CVE-2023-6992] = "cpe-incorrect: this CVE is for cloudflare zlib" diff --git a/meta/recipes-core/zlib/zlib_1.3.bb b/meta/recipes-core/zlib/zlib_1.3.bb deleted file mode 100644 index ede75f90bd..0000000000 --- a/meta/recipes-core/zlib/zlib_1.3.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Zlib Compression Library" -DESCRIPTION = "Zlib is a general-purpose, patent-free, lossless data compression \ -library which is used by many different programs." -HOMEPAGE = "http://zlib.net/" -SECTION = "libs" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0" - -# The source tarball needs to be .gz as only the .gz ends up in fossils/ -SRC_URI = "https://zlib.net/${BP}.tar.gz \ - file://0001-configure-Pass-LDFLAGS-to-link-tests.patch \ - file://run-ptest \ - " -UPSTREAM_CHECK_URI = "http://zlib.net/" - -SRC_URI[sha256sum] = "ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e" - -# When a new release is made the previous release is moved to fossils/, so add this -# to PREMIRRORS so it is also searched automatically. -PREMIRRORS:append = " https://zlib.net/ https://zlib.net/fossils/" - -CFLAGS += "-D_REENTRANT" - -RDEPENDS:${PN}-ptest += "make" - -inherit ptest - -B = "${WORKDIR}/build" - -do_configure() { - LDCONFIG=true ${S}/configure --prefix=${prefix} --shared --libdir=${libdir} --uname=GNU -} -do_configure[cleandirs] += "${B}" - -do_compile() { - oe_runmake shared -} - -do_install() { - oe_runmake DESTDIR=${D} install -} - -do_install_ptest() { - install ${B}/examplesh ${D}${PTEST_PATH} -} - -BBCLASSEXTEND = "native nativesdk" - -CVE_STATUS[CVE-2023-45853] = "not-applicable-config: we don't build minizip" -CVE_STATUS[CVE-2023-6992] = "cpe-incorrect: this CVE is for cloudflare zlib" -- cgit v1.2.3-54-g00ecf