upgrade zlib
This commit is contained in:
parent
2d38cc4a1d
commit
18ef0d5ab5
|
|
@ -0,0 +1,54 @@
|
||||||
|
From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mark Adler <madler@alumni.caltech.edu>
|
||||||
|
Date: Wed, 30 Mar 2022 11:14:53 -0700
|
||||||
|
Subject: [PATCH] Correct incorrect inputs provided to the CRC functions.
|
||||||
|
|
||||||
|
The previous releases of zlib were not sensitive to incorrect CRC
|
||||||
|
inputs with bits set above the low 32. This commit restores that
|
||||||
|
behavior, so that applications with such bugs will continue to
|
||||||
|
operate as before.
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2]
|
||||||
|
Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
|
||||||
|
---
|
||||||
|
crc32.c | 8 ++++----
|
||||||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/crc32.c b/crc32.c
|
||||||
|
index a1bdce5..451887b 100644
|
||||||
|
--- a/crc32.c
|
||||||
|
+++ b/crc32.c
|
||||||
|
@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
|
||||||
|
#endif /* DYNAMIC_CRC_TABLE */
|
||||||
|
|
||||||
|
/* Pre-condition the CRC */
|
||||||
|
- crc ^= 0xffffffff;
|
||||||
|
+ crc = (~crc) & 0xffffffff;
|
||||||
|
|
||||||
|
/* Compute the CRC up to a word boundary. */
|
||||||
|
while (len && ((z_size_t)buf & 7) != 0) {
|
||||||
|
@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
|
||||||
|
#endif /* DYNAMIC_CRC_TABLE */
|
||||||
|
|
||||||
|
/* Pre-condition the CRC */
|
||||||
|
- crc ^= 0xffffffff;
|
||||||
|
+ crc = (~crc) & 0xffffffff;
|
||||||
|
|
||||||
|
#ifdef W
|
||||||
|
|
||||||
|
@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
|
||||||
|
#ifdef DYNAMIC_CRC_TABLE
|
||||||
|
once(&made, make_crc_table);
|
||||||
|
#endif /* DYNAMIC_CRC_TABLE */
|
||||||
|
- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
|
||||||
|
+ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ========================================================================= */
|
||||||
|
@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op)
|
||||||
|
uLong crc2;
|
||||||
|
uLong op;
|
||||||
|
{
|
||||||
|
- return multmodp(op, crc1) ^ crc2;
|
||||||
|
+ return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,80 @@
|
||||||
|
Upstream-Status: Submitted [https://github.com/madler/zlib/pull/599]
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||||
|
|
||||||
|
From f15584918a7fbbe3cc794ad59100e5e8153ea9f6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Tue, 8 Mar 2022 22:38:47 -0800
|
||||||
|
Subject: [PATCH] configure: Pass LDFLAGS to link tests
|
||||||
|
|
||||||
|
LDFLAGS can contain critical flags without which linking wont succeed
|
||||||
|
therefore ensure that all configure tests involving link time checks are
|
||||||
|
using LDFLAGS on compiler commandline along with CFLAGS to ensure the
|
||||||
|
tests perform correctly. Without this some tests may fail resulting in
|
||||||
|
wrong confgure result, ending in miscompiling the package
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
configure | 12 ++++++------
|
||||||
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure b/configure
|
||||||
|
index 52ff4a0..d04ee59 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -427,7 +427,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 &&
|
||||||
|
- 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) {
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
- if try $CC $CFLAGS -o $test $test.c; then
|
||||||
|
+ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
|
||||||
|
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) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
- if try $CC $CFLAGS -o $test $test.c; then
|
||||||
|
+ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
|
||||||
|
echo "Checking for fseeko... Yes." | tee -a configure.log
|
||||||
|
else
|
||||||
|
CFLAGS="${CFLAGS} -DNO_FSEEKO"
|
||||||
|
@@ -554,7 +554,7 @@ cat > $test.c <<EOF
|
||||||
|
#include <errno.h>
|
||||||
|
int main() { return strlen(strerror(errno)); }
|
||||||
|
EOF
|
||||||
|
-if try $CC $CFLAGS -o $test $test.c; then
|
||||||
|
+if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
|
||||||
|
echo "Checking for strerror... Yes." | tee -a configure.log
|
||||||
|
else
|
||||||
|
CFLAGS="${CFLAGS} -DNO_STRERROR"
|
||||||
|
@@ -661,7 +661,7 @@ int main()
|
||||||
|
return (mytest("Hello%d\n", 1));
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
- if try $CC $CFLAGS -o $test $test.c; then
|
||||||
|
+ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
|
||||||
|
echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log
|
||||||
|
|
||||||
|
echo >> configure.log
|
||||||
|
@@ -751,7 +751,7 @@ int main()
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
- if try $CC $CFLAGS -o $test $test.c; then
|
||||||
|
+ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
|
||||||
|
echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log
|
||||||
|
|
||||||
|
echo >> configure.log
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
Upstream-Status: Backport
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||||
|
|
||||||
|
From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mark Adler <madler@alumni.caltech.edu>
|
||||||
|
Date: Mon, 28 Mar 2022 18:34:10 -0700
|
||||||
|
Subject: [PATCH] Fix configure issue that discarded provided CC definition.
|
||||||
|
|
||||||
|
---
|
||||||
|
configure | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/configure b/configure
|
||||||
|
index 52ff4a04e..3fa3e8618 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -174,7 +174,10 @@ if test -z "$CC"; then
|
||||||
|
else
|
||||||
|
cc=${CROSS_PREFIX}cc
|
||||||
|
fi
|
||||||
|
+else
|
||||||
|
+ cc=${CC}
|
||||||
|
fi
|
||||||
|
+
|
||||||
|
cflags=${CFLAGS-"-O3"}
|
||||||
|
# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
|
||||||
|
case "$cc" in
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
Obey LDFLAGS for tests
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/madler/zlib/pull/409]
|
||||||
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||||
|
|
||||||
|
--- zlib-1.2.8.orig/Makefile.in
|
||||||
|
+++ zlib-1.2.8/Makefile.in
|
||||||
|
@@ -26,7 +26,7 @@ CFLAGS=-O
|
||||||
|
|
||||||
|
SFLAGS=-O
|
||||||
|
LDFLAGS=
|
||||||
|
-TEST_LDFLAGS=-L. libz.a
|
||||||
|
+TEST_LDFLAGS=-L. $(LDFLAGS)
|
||||||
|
LDSHARED=$(CC)
|
||||||
|
CPP=$(CC) -E
|
||||||
|
|
||||||
|
@@ -176,22 +176,22 @@ placebo $(SHAREDLIBV): $(PIC_OBJS) libz.
|
||||||
|
-@rmdir objs
|
||||||
|
|
||||||
|
example$(EXE): example.o $(STATICLIB)
|
||||||
|
- $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
|
||||||
|
+ $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(STATICLIB)
|
||||||
|
|
||||||
|
minigzip$(EXE): minigzip.o $(STATICLIB)
|
||||||
|
- $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
|
||||||
|
+ $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(STATICLIB)
|
||||||
|
|
||||||
|
examplesh$(EXE): example.o $(SHAREDLIBV)
|
||||||
|
- $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
|
||||||
|
+ $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(SHAREDLIBV)
|
||||||
|
|
||||||
|
minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
|
||||||
|
- $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
|
||||||
|
+ $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(SHAREDLIBV)
|
||||||
|
|
||||||
|
example64$(EXE): example64.o $(STATICLIB)
|
||||||
|
- $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
|
||||||
|
+ $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) $(STATICLIB)
|
||||||
|
|
||||||
|
minigzip64$(EXE): minigzip64.o $(STATICLIB)
|
||||||
|
- $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
|
||||||
|
+ $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) $(STATICLIB)
|
||||||
|
|
||||||
|
install-libs: $(LIBS)
|
||||||
|
-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
if ./examplesh ; then
|
||||||
|
echo "PASS: zlib"
|
||||||
|
else
|
||||||
|
echo "FAIL: zlib"
|
||||||
|
fi
|
||||||
|
|
@ -0,0 +1,54 @@
|
||||||
|
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"
|
||||||
|
|
||||||
|
SRC_URI = "https://zlib.net/${BP}.tar.xz \
|
||||||
|
file://cc.patch \
|
||||||
|
file://ldflags-tests.patch \
|
||||||
|
file://0001-configure-Pass-LDFLAGS-to-link-tests.patch \
|
||||||
|
file://run-ptest \
|
||||||
|
file://0001-Correct-incorrect-inputs-provided-to-the-CRC-functio.patch \
|
||||||
|
"
|
||||||
|
UPSTREAM_CHECK_URI = "http://zlib.net/"
|
||||||
|
|
||||||
|
SRC_URI[sha256sum] = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"
|
||||||
|
|
||||||
|
CFLAGS += "-D_REENTRANT"
|
||||||
|
|
||||||
|
RDEPENDS_${PN}-ptest += "make"
|
||||||
|
|
||||||
|
inherit ptest
|
||||||
|
|
||||||
|
do_configure() {
|
||||||
|
LDCONFIG=true ./configure --prefix=${prefix} --shared --libdir=${libdir} --uname=GNU
|
||||||
|
}
|
||||||
|
|
||||||
|
do_compile() {
|
||||||
|
oe_runmake shared
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install() {
|
||||||
|
oe_runmake DESTDIR=${D} install
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install_ptest() {
|
||||||
|
install ${B}/examplesh ${D}${PTEST_PATH}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Move zlib shared libraries for target builds to $base_libdir so the library
|
||||||
|
# can be used in early boot before $prefix is mounted.
|
||||||
|
do_install_append_class-target() {
|
||||||
|
if [ ${base_libdir} != ${libdir} ]
|
||||||
|
then
|
||||||
|
mkdir -p ${D}/${base_libdir}
|
||||||
|
mv ${D}/${libdir}/libz.so.* ${D}/${base_libdir}
|
||||||
|
libname=`readlink ${D}/${libdir}/libz.so`
|
||||||
|
ln -sf ${@oe.path.relative("${libdir}", "${base_libdir}")}/$libname ${D}${libdir}/libz.so
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
Loading…
Reference in New Issue