gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-01 23:28:08 -07:00
Code Issues Projects Releases Wiki Activity

app-antivirus/clamav: use upstream fix for broken zlib check instead of disabling it completely

Browse Source 
Ack'ed by radhermit

Gentoo-Bug: https://bugs.gentoo.org/604650

Package-Manager: Portage-2.3.2, Repoman-2.3.1
This commit is contained in:
Austin English
2017-01-27 13:36:06 -06:00
parent 8dc1f6480a
commit bcbbdee31e
4 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app-antivirus/clamav/clamav-0.99.1.ebuild
View File

@@ -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() {

5
app-antivirus/clamav/clamav-0.99.2.ebuild
View File

@@ -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 \

5
app-antivirus/clamav/clamav-0.99.ebuild
View File

@@ -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() {

22
app-antivirus/clamav/files/clamav-configure-zlib.patch Normal file
View File

@@ -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