From: Adolf Belka <adolf.belka@ipfire.org>
Date: Sat, 17 May 2025 11:43:10 +0000 (+0200)
Subject: zlib-ng: Update to version 2.2.4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75d71006db82b731f5208dac3b7b2807ce1beee7;p=ipfire-2.x.git

zlib-ng: Update to version 2.2.4

- Update from version 2.2.3 to 2.2.4
- Update of rootfile
- Changelog
    2.2.4
	Important fixes
	    Fix potential shift overflow problems reported by static checkers #1859
	    VS2015: Fix an unfortunate bug #1862
	    RVV: Workaround error G6E97C40B #1853
	    s390x: Disable CRC32-VX Extensions for some broken Clang versions #1852
	Buildsystem
	    Improve include directory usage #1855
	    CMake: disable LTO for some configure checks #1850
	Tests/Benchmarks
	    Add uncompress benchmark #1860
	CI
	    Fix automatic Windows 32-bit ARM release builds #1839
	    CI changes for Ubuntu 24 #1843 #1857
	    Increase CMake workflow timeout #1854
	    s390x: Update CI clang version #1858
	    s390x docker rebuild script improvements #1846

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/zlib-ng b/config/rootfiles/common/zlib-ng
index 4f5e65293..eae6e6062 100644
--- a/config/rootfiles/common/zlib-ng
+++ b/config/rootfiles/common/zlib-ng
@@ -9,7 +9,7 @@ lib/libz.so.1.3.1.zlib-ng
 #usr/include/zlib_name_mangling.h
 #usr/lib/libz-ng.so
 usr/lib/libz-ng.so.2
-usr/lib/libz-ng.so.2.2.3
+usr/lib/libz-ng.so.2.2.4
 #usr/lib/pkgconfig
 #usr/lib/pkgconfig/zlib-ng.pc
 #usr/lib/pkgconfig/zlib.pc
diff --git a/lfs/zlib-ng b/lfs/zlib-ng
index 5c2c5a30e..7b1a9fbee 100644
--- a/lfs/zlib-ng
+++ b/lfs/zlib-ng
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.2.3
+VER        = 2.2.4
 
 THISAPP    = zlib-ng-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 65cd976d559dcc31f34861a01b2eb0ce0439dd6412553a5a9842d2d937d4a0d1194aec98f478f5def4a0401e65a7c97b6843122bae49a35f96c7e2c59e79cc64
+$(DL_FILE)_BLAKE2 = eb118c4b1d6de1b6cb5e3e1fcc8cc36ccf794321fab49f6070868515b179845495bf8833222107cc874397a3c2043a39c28d0f5d5a2bd450afaba606747a07cd
 
 install : $(TARGET)
 
@@ -79,15 +79,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Build the regular version
 	cd $(DIR_APP) && mkdir -pv build
 	cd $(DIR_APP)/build && ../configure \
-		--prefix=$(PREFIX)
+					--prefix=$(PREFIX)
 	cd $(DIR_APP)/build && make $(MAKETUNING) VERBOSE=1
 
 	# Build the compat version
 	cd $(DIR_APP) && mkdir -pv compat
 	cd $(DIR_APP)/compat && ../configure \
-		--prefix=$(PREFIX) \
-		--zlib-compat \
-		--without-new-strategies
+					--prefix=$(PREFIX) \
+					--zlib-compat \
+					--without-new-strategies
 	cd $(DIR_APP)/compat && make $(MAKETUNING) VERBOSE=1
 
 	# Install both versions