From owner-svn-ports-head@freebsd.org  Mon Jan  9 13:35:58 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5CD6CCA6E56;
 Mon,  9 Jan 2017 13:35:58 +0000 (UTC)
 (envelope-from garga@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2CFFD1612;
 Mon,  9 Jan 2017 13:35:58 +0000 (UTC)
 (envelope-from garga@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v09DZvgS094514;
 Mon, 9 Jan 2017 13:35:57 GMT (envelope-from garga@FreeBSD.org)
Received: (from garga@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v09DZvaC094513;
 Mon, 9 Jan 2017 13:35:57 GMT (envelope-from garga@FreeBSD.org)
Message-Id: <201701091335.v09DZvaC094513@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: garga set sender to
 garga@FreeBSD.org using -f
From: Renato Botelho <garga@FreeBSD.org>
Date: Mon, 9 Jan 2017 13:35:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r430948 - head/security/clamav/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jan 2017 13:35:58 -0000

Author: garga
Date: Mon Jan  9 13:35:57 2017
New Revision: 430948
URL: https://svnweb.freebsd.org/changeset/ports/430948

Log:
  Fix zlib version detect to make sure it doesn't consider 1.2.10 as bad
  version. It fixes build on 12-CURRENT

Modified:
  head/security/clamav/files/patch-configure

Modified: head/security/clamav/files/patch-configure
==============================================================================
--- head/security/clamav/files/patch-configure	Mon Jan  9 13:16:49 2017	(r430947)
+++ head/security/clamav/files/patch-configure	Mon Jan  9 13:35:57 2017	(r430948)
@@ -1,6 +1,18 @@
---- configure.orig	2014-06-25 04:04:20.000000000 -0300
-+++ configure	2014-06-25 04:04:05.000000000 -0300
-@@ -18682,7 +18682,7 @@
+--- configure.orig	2016-04-22 16:19:50 UTC
++++ configure
+@@ -18716,9 +18716,9 @@ then
+     as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5
+ else
+ 
+-    vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
++    vuln=`grep "ZLIB_VERSION \"1.2.0\"" $ZLIB_HOME/include/zlib.h`
+     if test -z "$vuln"; then
+-	vuln=`grep "ZLIB_VERSION \"1.2.1" $ZLIB_HOME/include/zlib.h`
++	vuln=`grep "ZLIB_VERSION \"1.2.1\"" $ZLIB_HOME/include/zlib.h`
+     fi
+ 
+     if test -n "$vuln"; then
+@@ -20758,7 +20758,7 @@ $as_echo "#define C_BSD 1" >>confdefs.h
      ;;
  freebsd*)
      if test "$have_pthreads" = "yes"; then
@@ -9,7 +21,7 @@
  	TH_SAFE="-thread-safe"
      fi
  
-@@ -18858,7 +18858,7 @@
+@@ -20934,7 +20934,7 @@ esac
  if test "$have_milter" = "yes"; then
  
          save_LIBS="$LIBS"