a7fa40a9c1
Fixes CVE-2018-25032.
Release notes:
http://madler.net/pipermail/zlib-announce_madler.net/2022/000012.html
Changelog: https://github.com/madler/zlib/blob/master/ChangeLog
Added upstream patch to fix build error.
Updated license hash due to version bump, reformatted hashes:
21767c654d
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
29 lines
767 B
Diff
29 lines
767 B
Diff
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.
|
|
|
|
Downloaded from upstream commit:
|
|
https://github.com/madler/zlib/commit/05796d3d8d5546cf1b4dfe2cd72ab746afae505d
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
---
|
|
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
|