From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] zlib: Update to 1.2.11 Date: Tue, 24 Jan 2017 14:30:13 +0000 Message-ID: <1485268213.30934.59.camel@ipfire.org> In-Reply-To: <20170121082029.22695-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6314141586117514409==" List-Id: --===============6314141586117514409== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, sorry, I got a bit confused by this patch and wasn't sure if this should be merged. Merged it now. Best, -Michael On Sat, 2017-01-21 at 09:20 +0100, Matthias Fischer wrote: > Based on: > http://git.ipfire.org/?p=3Dpeople/mlorenz/ipfire-2.x.git;a=3Dcommit;h=3Db69= 3162e9fdc > 7c4cae2f148e8c7832c689ac6fd2 > http://git.ipfire.org/?p=3Dpeople/mlorenz/ipfire-2.x.git;a=3Dcommit;h=3D43a= 3b9986b77 > 10eb685f00d6099965ebb220c012 >=20 > Sadly, I couldn't avoid this configure-error while building 'clamav': >=20 > ... > 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! > ... >=20 > '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 f= or > 1.2.11. >=20 > Therefore, '--disable-zlib-vcheck' was added to 'clamav'-configure options. > Any hints are welcome. >=20 > Testing zlib 1.2.11 with clamav 0.96.2 didn't find any seen problems so far. >=20 > Best, > Matthias >=20 > Signed-off-by: Matthias Fischer > --- > =C2=A0config/rootfiles/common/zlib | 2 +- > =C2=A0lfs/clamav=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 1 + > =C2=A0lfs/zlib=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 8 ++++---- > =C2=A03 files changed, 6 insertions(+), 5 deletions(-) >=20 > 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 @@ > =C2=A0lib/libz.so > =C2=A0lib/libz.so.1 > -lib/libz.so.1.2.8 > +lib/libz.so.1.2.11 > =C2=A0#usr/include/zconf.h > =C2=A0#usr/include/zlib.h > =C2=A0#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)) > =C2=A0 cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/clamav/llvm- > glibc.patch > =C2=A0 cd $(DIR_APP) && ./configure \ > =C2=A0 --prefix=3D/usr \ > + --disable-zlib-vcheck \ > =C2=A0 --sysconfdir=3D/var/ipfire/clamav \ > =C2=A0 $(CONFIGURE_FLAGS) > =C2=A0 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 @@ > =C2=A0#####################################################################= ######## > ## > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 > =C2=A0# > =C2=A0# IPFire.org - A linux based > firewall=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > -# Copyright (C) 2007=C2=A0=C2=A0Michael Tremer & Christian > Schmidt=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > +# Copyright (C) 2007-2017=C2=A0=C2=A0IPFire Team=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > =C2=A0# > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 > =C2=A0# > =C2=A0# This program is free software: you can redistribute it and/or > modify=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > =C2=A0# it under the terms of the GNU General Public License as published > by=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > @@ -24,7 +24,7 @@ > =C2=A0 > =C2=A0include Config > =C2=A0 > -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.2.8 > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.2.11 > =C2=A0 > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D zlib-$(VER) > =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.gz > @@ -39,9 +39,9 @@ CFLAGS=C2=A0=C2=A0=C2=A0=C2=A0+=3D -fPIC -DPIC > =C2=A0#####################################################################= ######## > ## > =C2=A0objects =3D $(DL_FILE) > =C2=A0 > -$(DL_FILE)=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=3D $(DL_FROM)/$(DL_FILE) > +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > =C2=A0 > -$(DL_FILE)_MD5=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=3D 44d667c142d7cda120332623eab69f40 > +$(DL_FILE)_MD5 =3D 1c9f62f0778697a09d36121ead88e08e > =C2=A0 > =C2=A0install : $(TARGET) > =C2=A0 --===============6314141586117514409== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlloMlQxQUFvSkVJQjU4UDl2a0FrSDAwa1AvMjdMc3hUNGNCUm51bStYTkFsZGdKZVMK NjF4Y0NWTENqUEc3VkYxam1xU0RCNVNpV0NKaHVBSG9mQlBUcE9JbDZzU0pkQi9vaElkSEpKdmpi T1M0dkN6aQpONFl4OGMzSzZhU2ZCYi9wRlVnejlEY3ZRRFVYd1VhTGhNMlh1eDZXWHRUUXZuSHkw T21MdDNJUTBBY3FQLzNJCkQ5L0Q1VVloMjNlMFI3YWh0NlMvWC82RFZsVFBUQ3hWZ1N6RXhVOFdR a2RnaDRjU0dYc0l6cjlWUzl3Q2t0L2QKZU9sbWNyQ1NBZ016RHM4eGxnZTRaUGZTZnBMZEMyVisz cTFaWHh3SXRXa0JlR0JJWGpkUFJRZm50Znl6OUlsQQpMdUw2SlVGQUk3SHRzRzBxMC8rNHpxZ2Fj SVFLUFJoa1BNMWsxaE5KdWVzZUlaMFB1dUd1L2pxZU0xRjBqVlZQCkpXU0Z0ODgwc1ZSSHFWbmRB YXE5MGFJOUdJWkhxRkZ5NWJGUVBhU3BTb1pYNk9oazlWOHlmakFtLzk4Z1pDeHMKN3VYcGprMGZz a3paZGZyODBpV0tsNldMbHI5VXJJVWl1VDYvalg5RjlYSEFoRmRWZ0NrczdtN3ZmN0NZWDV4eQpT dTNwdmdEcTI1ZWNRRStuQkxpeHZqNlA1STdyWElEWmNXdVdtdkVWZlZSMVFUekgzSUM1Q040amMr UTlPb3FpCmZMUXVGZldJRFBhSC9Fc0lqbE1sM0wyU2lVeUo4TmpWM2UybDh5VlVMd1hKeWJPcW91 TVNqY3RTMGtnaWR5bk8KU2w3UXFxbXpvOXpuZ0owNkVBOGkveTNHaUtUUmkxRmh4SGR4NldMbTB1 S3VtQWZYc0dPdWRxZjdpZ0ZvNGphRQpCbkNGN1Z0NytDV2NjbGpraWR1Rgo9U056SAotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============6314141586117514409==--