commit: bcbbdee31e7cc94d9262a9df057db8fdd31d2f47 Author: Austin English <wizardedit <AT> gentoo <DOT> org> AuthorDate: Fri Jan 27 19:36:06 2017 +0000 Commit: Austin English <wizardedit <AT> gentoo <DOT> org> CommitDate: Fri Jan 27 19:44:13 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcbbdee3
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 app-antivirus/clamav/clamav-0.99.1.ebuild | 7 +++++-- app-antivirus/clamav/clamav-0.99.2.ebuild | 5 +++-- app-antivirus/clamav/clamav-0.99.ebuild | 5 ++++- .../clamav/files/clamav-configure-zlib.patch | 22 ++++++++++++++++++++++ 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/app-antivirus/clamav/clamav-0.99.1.ebuild b/app-antivirus/clamav/clamav-0.99.1.ebuild index 4f16064..be2a73a 100644 --- a/app-antivirus/clamav/clamav-0.99.1.ebuild +++ b/app-antivirus/clamav/clamav-0.99.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit eutils flag-o-matic user systemd +inherit autotools eutils flag-o-matic user systemd DESCRIPTION="Clam Anti-Virus Scanner" HOMEPAGE="http://www.clamav.net/"; @@ -45,6 +45,9 @@ pkg_setup() { src_prepare() { use ppc64 && append-flags -mminimal-toc use uclibc && export ac_cv_type_error_t=yes + + epatch "${FILESDIR}"/${PN}-configure-zlib.patch # 604650, fixed in upstream HEAD + eautoconf } src_configure() { diff --git a/app-antivirus/clamav/clamav-0.99.2.ebuild b/app-antivirus/clamav/clamav-0.99.2.ebuild index 5ab484b..1ce8399 100644 --- a/app-antivirus/clamav/clamav-0.99.2.ebuild +++ b/app-antivirus/clamav/clamav-0.99.2.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils flag-o-matic user systemd +inherit autotools eutils flag-o-matic user systemd DESCRIPTION="Clam Anti-Virus Scanner" HOMEPAGE="http://www.clamav.net/"; @@ -48,13 +48,14 @@ src_prepare() { use uclibc && export ac_cv_type_error_t=yes epatch "${FILESDIR}"/${P}-gcc-6.patch #592432 + epatch "${FILESDIR}"/${PN}-configure-zlib.patch # 604650, fixed in upstream HEAD + eautoconf } src_configure() { econf \ --disable-experimental \ --disable-fanotify \ - --disable-zlib-vcheck \ --enable-id-check \ --with-dbdir="${EPREFIX}"/var/lib/clamav \ --with-system-tommath \ diff --git a/app-antivirus/clamav/clamav-0.99.ebuild b/app-antivirus/clamav/clamav-0.99.ebuild index 144082f..b77f3e7 100644 --- a/app-antivirus/clamav/clamav-0.99.ebuild +++ b/app-antivirus/clamav/clamav-0.99.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils flag-o-matic user systemd +inherit autotools eutils flag-o-matic user systemd DESCRIPTION="Clam Anti-Virus Scanner" HOMEPAGE="http://www.clamav.net/"; @@ -45,6 +45,9 @@ pkg_setup() { src_prepare() { use ppc64 && append-flags -mminimal-toc use uclibc && export ac_cv_type_error_t=yes + + epatch "${FILESDIR}"/${PN}-configure-zlib.patch # 604650, fixed in upstream HEAD + eautoconf } src_configure() { 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 00000000..8d1f4e6 --- /dev/null +++ b/app-antivirus/clamav/files/clamav-configure-zlib.patch @@ -0,0 +1,22 @@ +commit f0bcd186190fe6e67b3f0eaaceb7a99aa6a98865 +Author: Steven Morgan <stevm...@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
