From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] zlib: Update to 1.2.11
Date: Sat, 21 Jan 2017 09:20:29 +0100
Message-ID: <20170121082029.22695-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6014633095239142891=="
List-Id: <development.lists.ipfire.org>

--===============6014633095239142891==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Based on:
http://git.ipfire.org/?p=3Dpeople/mlorenz/ipfire-2.x.git;a=3Dcommit;h=3Db6931=
62e9fdc7c4cae2f148e8c7832c689ac6fd2
http://git.ipfire.org/?p=3Dpeople/mlorenz/ipfire-2.x.git;a=3Dcommit;h=3D43a3b=
9986b7710eb685f00d6099965ebb220c012

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 stab=
ility issues then!
...

'clamav' seems to check 'zlib.h' for an appropriate zlib version ('clamav'-co=
nfigure,
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(a)ipfire.org>
---
 config/rootfiles/common/zlib | 2 +-
 lfs/clamav                   | 1 +
 lfs/zlib                     | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/rootfiles/common/zlib b/config/rootfiles/common/zlib
index 43c5ac932..ef52aa5d6 100644
--- 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 0625ecf93..2cd5e493b 100644
--- 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.pat=
ch
 	cd $(DIR_APP) && ./configure \
 		--prefix=3D/usr \
+		--disable-zlib-vcheck \
 		--sysconfdir=3D/var/ipfire/clamav \
 		$(CONFIGURE_FLAGS)
 	cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/lfs/zlib b/lfs/zlib
index 6520a2374..d0607513e 100644
--- 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(a)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 @@
=20
 include Config
=20
-VER        =3D 1.2.8
+VER        =3D 1.2.11
=20
 THISAPP    =3D zlib-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -39,9 +39,9 @@ CFLAGS    +=3D -fPIC -DPIC
 ############################################################################=
###
 objects =3D $(DL_FILE)
=20
-$(DL_FILE)                           =3D $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5                       =3D 44d667c142d7cda120332623eab69f40
+$(DL_FILE)_MD5 =3D 1c9f62f0778697a09d36121ead88e08e
=20
 install : $(TARGET)
=20
--=20
2.11.0


--===============6014633095239142891==--