zlib: Update to 1.2.11

Based on:
http://git.ipfire.org/?p=people/mlorenz/ipfire-2.x.git;a=commit;h=b693162e9fdc7c4cae2f148e8c7832c689ac6fd2
http://git.ipfire.org/?p=people/mlorenz/ipfire-2.x.git;a=commit;h=43a3b9986b7710eb685f00d6099965ebb220c012

Sadly, I couldn't avoid this configure-error while building 'clamav':

...
checking for zlib installation... using /usr
configure: error: The installed zlib version may contain a security bug.
Please upgrade to 1.2.2 or later: http://www.zlib.net.
You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!
...

'clamav' seems to check 'zlib.h' for an appropriate zlib version ('clamav'-configure,
line 18679ff) greater v1.2.1 (line 18719ff), but I didn't find a solution for 1.2.11.

Therefore, '--disable-zlib-vcheck' was added to 'clamav'-configure options.
Any hints are welcome.

Testing zlib 1.2.11 with clamav 0.96.2 didn't find any seen problems so far.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/zlib b/config/rootfiles/common/zlib
index 43c5ac932b3387b3743b39784bd0766ac087c353..ef52aa5d63ddac439ae4e2b2c200761e7866c847 100644 (file)
--- a/config/rootfiles/common/zlib
+++ b/config/rootfiles/common/zlib
@@ -1,6 +1,6 @@
 lib/libz.so
 lib/libz.so.1
-lib/libz.so.1.2.8
+lib/libz.so.1.2.11
 #usr/include/zconf.h
 #usr/include/zlib.h
 #usr/lib/libz.a

diff --git a/lfs/clamav b/lfs/clamav
index 0625ecf9366ebdaabc7d0b31a88b5e65a1e75e23..2cd5e493b9e86eda29b01f4be3d3dc459023fa1e 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/clamav/llvm-glibc.patch
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
+               --disable-zlib-vcheck \
                --sysconfdir=/var/ipfire/clamav \
                $(CONFIGURE_FLAGS)
        cd $(DIR_APP) && make $(MAKETUNING)

diff --git a/lfs/zlib b/lfs/zlib
index 6520a2374db5c43d81c7e1954521ea54b2207839..d0607513e8c2237f843d8d66795d8d91e3aff4a7 100644 (file)
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2017  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        = 1.2.8
+VER        = 1.2.11
 
 THISAPP    = zlib-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -39,9 +39,9 @@ CFLAGS    += -fPIC -DPIC
 ###############################################################################
 objects = $(DL_FILE)
 
-$(DL_FILE)                           = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5                       = 44d667c142d7cda120332623eab69f40
+$(DL_FILE)_MD5 = 1c9f62f0778697a09d36121ead88e08e
 
 install : $(TARGET)