summaryrefslogtreecommitdiffstats
path: root/archive-libs
diff options
context:
space:
mode:
authorPavel Vinogradov2022-03-28 14:19:29 -0400
committerPavel Vinogradov2022-03-28 17:26:24 -0400
commit9993f4496041342ec9080a10e0081c288e2a23f0 (patch)
tree24036837589edfc8b0b931dacd6f33b534ac1226 /archive-libs
parent5f5e7a86b180605fa6514f71fa037ba77bd1e10b (diff)
archive-libs/zlib: version 1.2.12, SECURITY_PATCH++
Diffstat (limited to 'archive-libs')
-rwxr-xr-xarchive-libs/zlib/BUILD5
-rwxr-xr-xarchive-libs/zlib/DETAILS6
-rw-r--r--archive-libs/zlib/HISTORY5
3 files changed, 12 insertions, 4 deletions
diff --git a/archive-libs/zlib/BUILD b/archive-libs/zlib/BUILD
index 4326b75097..6885a7ae23 100755
--- a/archive-libs/zlib/BUILD
+++ b/archive-libs/zlib/BUILD
@@ -1,7 +1,10 @@
OPTS="--eprefix=$INSTALL_ROOT $OPTS" &&
CFLAGS="$CFLAGS -DPIC -fPIC" &&
-CFLAGS="${CFLAGS/-O?/-O3} -fno-tree-vectorize -mstackrealign -DUNALIGNED_OK" &&
+CFLAGS="${CFLAGS//-O[gs0-9]/-O3}" &&
+CFLAGS="${CFLAGS//-Ofast/-O3}" &&
+CFLAGS="${CFLAGS//-O /-O3 }" &&
+CFLAGS+=" -fno-tree-vectorize -mstackrealign -DUNALIGNED_OK" &&
sedit "s/-O/$CFLAGS/" Makefile &&
diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS
index fa01126004..ef9c24278a 100755
--- a/archive-libs/zlib/DETAILS
+++ b/archive-libs/zlib/DETAILS
@@ -1,7 +1,7 @@
SPELL=zlib
- VERSION=1.2.11
- PATCHLEVEL=2
- SOURCE_HASH=sha512:73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
+ VERSION=1.2.12
+ SOURCE_HASH=sha512:cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.zlib.net/$SOURCE
diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY
index aa81502c40..d8f3c5e89c 100644
--- a/archive-libs/zlib/HISTORY
+++ b/archive-libs/zlib/HISTORY
@@ -1,3 +1,8 @@
+2022-03-28 Pavel Vinogradov <public@sourcemage.org>
+ * DETAILS: version 1.2.12, SECURITY_PAATCH++, (CVE-2018-25032)
+ * BUILD: modified filtering of CFLAGS to catch all possible variants of -O
+ (all known, at least)
+
2019-01-19 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: delete gnupg