diff options
| author | Christian Melki <christian.melki@t2data.com> | 2022-03-29 21:07:24 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2022-03-30 09:25:40 +0200 |
| commit | 1dda448a6bc87290fbd8e4b01d219d0eaf024b5b (patch) | |
| tree | 987c2d2003453a372b44b49a0d931fd2cb310f39 | |
| parent | 3114ee08bf379afd475d1379299b2edbb8e1acd4 (diff) | |
| download | ptxdist-1dda448a6bc87290fbd8e4b01d219d0eaf024b5b.tar.gz ptxdist-1dda448a6bc87290fbd8e4b01d219d0eaf024b5b.tar.xz | |
zlib: Version bump. 1.2.11 -> 1.2.12
5 years worth of changes.
Notable changes. Fix for CVE-2018-25032, crc32 speedups and
crc32 using aarch64 native crc32 insns.
https://github.com/madler/zlib/blob/master/ChangeLog
* Add patch from develop branch to fix last minute makefile bug.
Makefile introduced functionality just before the release of
1.2.12 which broke CC handling.
* README copyright year changes.
* README legal disclaimer added. No license change.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
Message-Id: <20220329190724.4084168-1-christian.melki@t2data.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch | 23 | ||||
| -rw-r--r-- | patches/zlib-1.2.12/series | 4 | ||||
| -rw-r--r-- | rules/zlib.make | 6 |
3 files changed, 30 insertions, 3 deletions
diff --git a/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch b/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch new file mode 100644 index 000000000..63bdb67c0 --- /dev/null +++ b/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch @@ -0,0 +1,23 @@ +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 52ff4a04ea89..3fa3e8618f9c 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 diff --git a/patches/zlib-1.2.12/series b/patches/zlib-1.2.12/series new file mode 100644 index 000000000..ac92b3ba7 --- /dev/null +++ b/patches/zlib-1.2.12/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch +# 5dfc5088b94416c3eb59b1a207bdec70 - git-ptx-patches magic diff --git a/rules/zlib.make b/rules/zlib.make index 96ef33966..dcfca75af 100644 --- a/rules/zlib.make +++ b/rules/zlib.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ZLIB) += zlib # # Paths and names # -ZLIB_VERSION := 1.2.11 -ZLIB_MD5 := 85adef240c5f370b308da8c938951a68 +ZLIB_VERSION := 1.2.12 +ZLIB_MD5 := 28687d676c04e7103bb6ff2b9694c471 ZLIB := zlib-$(ZLIB_VERSION) ZLIB_SUFFIX := tar.xz ZLIB_URL := \ @@ -25,7 +25,7 @@ ZLIB_URL := \ ZLIB_SOURCE := $(SRCDIR)/$(ZLIB).$(ZLIB_SUFFIX) ZLIB_DIR := $(BUILDDIR)/$(ZLIB) ZLIB_LICENSE := Zlib -ZLIB_LICENSE_FILES := file://README;md5=0ff45db88393c3152e458a047bba0ff1 +ZLIB_LICENSE_FILES := file://README;md5=7ae390a32824ef4d6316800962e5c66f # ---------------------------------------------------------------------------- # Prepare |