diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2017-01-09 13:35:57 +0000 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2017-01-09 13:35:57 +0000 |
| commit | ab098bd99c81720d60cda2cfd86ec919865c11b9 (patch) | |
| tree | 9020c19312e7f36e06bfa10e4654416af5897cbd | |
| parent | 9d79e7b1469f6887d302e13ce7c67c54408a2453 (diff) | |
| download | freebsd-ports-ab098bd99c81720d60cda2cfd86ec919865c11b9.zip | |
Fix zlib version detect to make sure it doesn't consider 1.2.10 as bad
version. It fixes build on 12-CURRENT
| -rw-r--r-- | security/clamav/files/patch-configure | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/security/clamav/files/patch-configure b/security/clamav/files/patch-configure index 3ef62c93e684..c72f937afb62 100644 --- a/security/clamav/files/patch-configure +++ b/security/clamav/files/patch-configure @@ -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" |