svn commit: r430948 - head/security/clamav/files

Renato Botelho garga at FreeBSD.org
Mon Jan 9 13:35:58 UTC 2017


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"


More information about the svn-ports-all mailing list