From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 1b0d73ffdb5e8ffb1297354cfdd1a3d6d91d0f60
Date: Tue, 24 Jan 2017 14:32:00 +0000
Message-ID: <20170124143200.BEF671078E80@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7207833861400746558=="
List-Id: <ipfire-scm.lists.ipfire.org>

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  1b0d73ffdb5e8ffb1297354cfdd1a3d6d91d0f60 (commit)
      from  3494b0cebb5ae1fd030d42017cd34c0b5870a13f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1b0d73ffdb5e8ffb1297354cfdd1a3d6d91d0f60
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Sat Jan 21 09:20:29 2017 +0100

    zlib: Update to 1.2.11
   =20
    Based on:
    http://git.ipfire.org/?p=3Dpeople/mlorenz/ipfire-2.x.git;a=3Dcommit;h=3Db=
693162e9fdc7c4cae2f148e8c7832c689ac6fd2
    http://git.ipfire.org/?p=3Dpeople/mlorenz/ipfire-2.x.git;a=3Dcommit;h=3D4=
3a3b9986b7710eb685f00d6099965ebb220c012
   =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=
 for 1.2.11.
   =20
    Therefore, '--disable-zlib-vcheck' was added to 'clamav'-configure option=
s.
    Any hints are welcome.
   =20
    Testing zlib 1.2.11 with clamav 0.96.2 didn't find any seen problems so f=
ar.
   =20
    Best,
    Matthias
   =20
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/zlib | 2 +-
 lfs/clamav                   | 1 +
 lfs/zlib                     | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/zlib b/config/rootfiles/common/zlib
index 43c5ac9..ef52aa5 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 0625ecf..2cd5e49 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 6520a23..d060751 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


hooks/post-receive
--
IPFire 2.x development tree

--===============7207833861400746558==--