1 |
commit: bcbbdee31e7cc94d9262a9df057db8fdd31d2f47 |
2 |
Author: Austin English <wizardedit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 27 19:36:06 2017 +0000 |
4 |
Commit: Austin English <wizardedit <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 27 19:44:13 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcbbdee3 |
7 |
|
8 |
app-antivirus/clamav: use upstream fix for broken zlib check instead of disabling it completely |
9 |
|
10 |
Ack'ed by radhermit |
11 |
|
12 |
Gentoo-Bug: https://bugs.gentoo.org/604650 |
13 |
|
14 |
Package-Manager: Portage-2.3.2, Repoman-2.3.1 |
15 |
|
16 |
app-antivirus/clamav/clamav-0.99.1.ebuild | 7 +++++-- |
17 |
app-antivirus/clamav/clamav-0.99.2.ebuild | 5 +++-- |
18 |
app-antivirus/clamav/clamav-0.99.ebuild | 5 ++++- |
19 |
.../clamav/files/clamav-configure-zlib.patch | 22 ++++++++++++++++++++++ |
20 |
4 files changed, 34 insertions(+), 5 deletions(-) |
21 |
|
22 |
diff --git a/app-antivirus/clamav/clamav-0.99.1.ebuild b/app-antivirus/clamav/clamav-0.99.1.ebuild |
23 |
index 4f16064..be2a73a 100644 |
24 |
--- a/app-antivirus/clamav/clamav-0.99.1.ebuild |
25 |
+++ b/app-antivirus/clamav/clamav-0.99.1.ebuild |
26 |
@@ -1,10 +1,10 @@ |
27 |
-# Copyright 1999-2016 Gentoo Foundation |
28 |
+# Copyright 1999-2017 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
# $Id$ |
31 |
|
32 |
EAPI=5 |
33 |
|
34 |
-inherit eutils flag-o-matic user systemd |
35 |
+inherit autotools eutils flag-o-matic user systemd |
36 |
|
37 |
DESCRIPTION="Clam Anti-Virus Scanner" |
38 |
HOMEPAGE="http://www.clamav.net/" |
39 |
@@ -45,6 +45,9 @@ pkg_setup() { |
40 |
src_prepare() { |
41 |
use ppc64 && append-flags -mminimal-toc |
42 |
use uclibc && export ac_cv_type_error_t=yes |
43 |
+ |
44 |
+ epatch "${FILESDIR}"/${PN}-configure-zlib.patch # 604650, fixed in upstream HEAD |
45 |
+ eautoconf |
46 |
} |
47 |
|
48 |
src_configure() { |
49 |
|
50 |
diff --git a/app-antivirus/clamav/clamav-0.99.2.ebuild b/app-antivirus/clamav/clamav-0.99.2.ebuild |
51 |
index 5ab484b..1ce8399 100644 |
52 |
--- a/app-antivirus/clamav/clamav-0.99.2.ebuild |
53 |
+++ b/app-antivirus/clamav/clamav-0.99.2.ebuild |
54 |
@@ -4,7 +4,7 @@ |
55 |
|
56 |
EAPI=5 |
57 |
|
58 |
-inherit eutils flag-o-matic user systemd |
59 |
+inherit autotools eutils flag-o-matic user systemd |
60 |
|
61 |
DESCRIPTION="Clam Anti-Virus Scanner" |
62 |
HOMEPAGE="http://www.clamav.net/" |
63 |
@@ -48,13 +48,14 @@ src_prepare() { |
64 |
use uclibc && export ac_cv_type_error_t=yes |
65 |
|
66 |
epatch "${FILESDIR}"/${P}-gcc-6.patch #592432 |
67 |
+ epatch "${FILESDIR}"/${PN}-configure-zlib.patch # 604650, fixed in upstream HEAD |
68 |
+ eautoconf |
69 |
} |
70 |
|
71 |
src_configure() { |
72 |
econf \ |
73 |
--disable-experimental \ |
74 |
--disable-fanotify \ |
75 |
- --disable-zlib-vcheck \ |
76 |
--enable-id-check \ |
77 |
--with-dbdir="${EPREFIX}"/var/lib/clamav \ |
78 |
--with-system-tommath \ |
79 |
|
80 |
diff --git a/app-antivirus/clamav/clamav-0.99.ebuild b/app-antivirus/clamav/clamav-0.99.ebuild |
81 |
index 144082f..b77f3e7 100644 |
82 |
--- a/app-antivirus/clamav/clamav-0.99.ebuild |
83 |
+++ b/app-antivirus/clamav/clamav-0.99.ebuild |
84 |
@@ -4,7 +4,7 @@ |
85 |
|
86 |
EAPI=5 |
87 |
|
88 |
-inherit eutils flag-o-matic user systemd |
89 |
+inherit autotools eutils flag-o-matic user systemd |
90 |
|
91 |
DESCRIPTION="Clam Anti-Virus Scanner" |
92 |
HOMEPAGE="http://www.clamav.net/" |
93 |
@@ -45,6 +45,9 @@ pkg_setup() { |
94 |
src_prepare() { |
95 |
use ppc64 && append-flags -mminimal-toc |
96 |
use uclibc && export ac_cv_type_error_t=yes |
97 |
+ |
98 |
+ epatch "${FILESDIR}"/${PN}-configure-zlib.patch # 604650, fixed in upstream HEAD |
99 |
+ eautoconf |
100 |
} |
101 |
|
102 |
src_configure() { |
103 |
|
104 |
diff --git a/app-antivirus/clamav/files/clamav-configure-zlib.patch b/app-antivirus/clamav/files/clamav-configure-zlib.patch |
105 |
new file mode 100644 |
106 |
index 00000000..8d1f4e6 |
107 |
--- /dev/null |
108 |
+++ b/app-antivirus/clamav/files/clamav-configure-zlib.patch |
109 |
@@ -0,0 +1,22 @@ |
110 |
+commit f0bcd186190fe6e67b3f0eaaceb7a99aa6a98865 |
111 |
+Author: Steven Morgan <stevmorg@×××××.com> |
112 |
+Date: Thu Jan 5 12:30:35 2017 -0500 |
113 |
+ |
114 |
+ bb111711 - fix zlib version check - patch by Daniel J. Luke. |
115 |
+ |
116 |
+diff --git a/m4/reorganization/libs/libz.m4 b/m4/reorganization/libs/libz.m4 |
117 |
+index b5c7414..f7b67ca 100644 |
118 |
+--- a/m4/reorganization/libs/libz.m4 |
119 |
++++ b/m4/reorganization/libs/libz.m4 |
120 |
+@@ -29,9 +29,9 @@ then |
121 |
+ AC_MSG_ERROR([Please install zlib and zlib-devel packages]) |
122 |
+ else |
123 |
+ |
124 |
+- vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h` |
125 |
++ vuln=`grep "ZLIB_VERSION \"1.2.0\"" $ZLIB_HOME/include/zlib.h` |
126 |
+ if test -z "$vuln"; then |
127 |
+- vuln=`grep "ZLIB_VERSION \"1.2.1" $ZLIB_HOME/include/zlib.h` |
128 |
++ vuln=`grep "ZLIB_VERSION \"1.2.1\"" $ZLIB_HOME/include/zlib.h` |
129 |
+ fi |
130 |
+ |
131 |
+ if test -n "$vuln"; then |