summaryrefslogtreecommitdiff
path: root/app-antivirus/clamav/files
diff options
context:
space:
mode:
authorAustin English <wizardedit@gentoo.org>2017-01-27 13:36:06 -0600
committerAustin English <wizardedit@gentoo.org>2017-01-27 13:44:13 -0600
commitbcbbdee31e7cc94d9262a9df057db8fdd31d2f47 (patch)
tree779da85d1dc05451f8796126b248879516ca339b /app-antivirus/clamav/files
parent8dc1f6480a1ce8acaf17885632bac3d2844b5f45 (diff)
downloadgentoo-bcbbdee31e7cc94d9262a9df057db8fdd31d2f47.tar.gz
gentoo-bcbbdee31e7cc94d9262a9df057db8fdd31d2f47.tar.xz
app-antivirus/clamav: use upstream fix for broken zlib check instead of disabling it completely
Ack'ed by radhermit Gentoo-Bug: https://bugs.gentoo.org/604650 Package-Manager: Portage-2.3.2, Repoman-2.3.1
Diffstat (limited to 'app-antivirus/clamav/files')
-rw-r--r--app-antivirus/clamav/files/clamav-configure-zlib.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/app-antivirus/clamav/files/clamav-configure-zlib.patch b/app-antivirus/clamav/files/clamav-configure-zlib.patch
new file mode 100644
index 00000000000..8d1f4e61537
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-configure-zlib.patch
@@ -0,0 +1,22 @@
+commit f0bcd186190fe6e67b3f0eaaceb7a99aa6a98865
+Author: Steven Morgan <stevmorg@cisco.com>
+Date: Thu Jan 5 12:30:35 2017 -0500
+
+ bb111711 - fix zlib version check - patch by Daniel J. Luke.
+
+diff --git a/m4/reorganization/libs/libz.m4 b/m4/reorganization/libs/libz.m4
+index b5c7414..f7b67ca 100644
+--- a/m4/reorganization/libs/libz.m4
++++ b/m4/reorganization/libs/libz.m4
+@@ -29,9 +29,9 @@ then
+ AC_MSG_ERROR([Please install zlib and zlib-devel packages])
+ 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