1 |
commit: 0bed854e02879dce0dd783dafb9ab175eb7ca443 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 25 03:02:23 2019 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 25 03:54:20 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bed854e |
7 |
|
8 |
app-antivirus/clamav: new version 0.102.1. |
9 |
|
10 |
This new version fixes some major problems in the last one. The milter |
11 |
isn't totally busted, a DoS was patched (CVE-2019-15961), we don't need |
12 |
to patch the build system to detect libxml2, and fanotify should now |
13 |
be found when it's there. |
14 |
|
15 |
I've also tweaked the documentation location so that we don't wind up |
16 |
with nested "html" directories, and stopped USE="-metadata-analysis-api" |
17 |
from clobbering USE="clamsubmit" in the ebuild. |
18 |
|
19 |
The mailing list reports that there are still intermittent test |
20 |
failures and a ./configure bug, but this one might actually be usable. |
21 |
|
22 |
Closes: https://bugs.gentoo.org/697686 |
23 |
Closes: https://bugs.gentoo.org/697688 |
24 |
Closes: https://bugs.gentoo.org/701094 |
25 |
Package-Manager: Portage-2.3.76, Repoman-2.3.16 |
26 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
27 |
|
28 |
app-antivirus/clamav/Manifest | 2 +- |
29 |
...mav-0.102.0-r2.ebuild => clamav-0.102.1.ebuild} | 13 +-- |
30 |
.../files/clamav-0.102.0-libxml2_pkgconfig.patch | 101 --------------------- |
31 |
3 files changed, 5 insertions(+), 111 deletions(-) |
32 |
|
33 |
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest |
34 |
index 00830a7c63b..6af7a532eee 100644 |
35 |
--- a/app-antivirus/clamav/Manifest |
36 |
+++ b/app-antivirus/clamav/Manifest |
37 |
@@ -1,4 +1,4 @@ |
38 |
DIST clamav-0.101.2.tar.gz 21722932 BLAKE2B 5c2960e678510a6f829fc9333e05a45a57a704e13eb407e0f890dd5553a1f9644eb3b1122c677755237b8c682127319d447a508087bc9130d14cd2cfec92896a SHA512 f9ea4589a8081acf7b6d454d1a068da05ae6574a9070a08f9438935795cb6dc084ffb9222b11fb1623f31962f859e6536a2f5bd1de29ef6b9b314efa5edc8c7e |
39 |
DIST clamav-0.101.3.tar.gz 21389753 BLAKE2B f254846dad40bd9dda650ece9dd672ca040fe4779b4f46a5cfa087808711055745d02c65f24da9589420e979a777bc435f68d25f6940ebf283cd0a8f240908b5 SHA512 285e6011ef5b68683daae7287005b2a615d7ee2fb9dac28d6db347cf7fe101da627aaec800366e83551f41afb78c6b08517def7aa30d0f0c347e54344b0b14d3 |
40 |
DIST clamav-0.101.4.tar.gz 21408145 BLAKE2B 5eba85dcf203f56cbd943e479e660469dcc1972819674f5624207f4123ec74207b664cba3c9b0318665d261176da338f3c3fba9c938eeb626ce75174d525a43f SHA512 fae914a95b674fa6bdea044abec702401146590ca0aaaea1245deb1c4770641a794f60ff7b448b24d8c1923150cb7ba230848974837257c3a8ab20ea1e2f86d3 |
41 |
-DIST clamav-0.102.0.tar.gz 13211357 BLAKE2B b3ba01f7ff63dbb4fcba57955b3ea364b56da6b71c01770cb6fabbd48a60cf43935aa0a869ef8d96d8f7adc65c9ebc681d08e87c2e07bc7469584a0d9833a4fd SHA512 7228f5f572e5ca32a458c262a5d297694059de04cb4a64364dd92e1d2e4560d58263d05bfb2053641ea7521c4040bef5a49b3cea27e77b907c95195cf4a54d84 |
42 |
+DIST clamav-0.102.1.tar.gz 13215586 BLAKE2B 653e5506ed0b19c154038e960184abf2773a8a12a775dda81ce4f69fe7e58c457c39d85e24ce43bda9f09f43766c81af69d5462e7459077b0e4886f73a2a5ba2 SHA512 2d0cd2dece771ab8228771f9a95eb0342e756083a0107b2bef31bd2f5f46c36aa692e15d7eb2ea321f535ea4e18c8df043c8663ae350d40fbe1bdb4d073dcb90 |
43 |
|
44 |
diff --git a/app-antivirus/clamav/clamav-0.102.0-r2.ebuild b/app-antivirus/clamav/clamav-0.102.1.ebuild |
45 |
similarity index 94% |
46 |
rename from app-antivirus/clamav/clamav-0.102.0-r2.ebuild |
47 |
rename to app-antivirus/clamav/clamav-0.102.1.ebuild |
48 |
index e768ec499d0..1236104e6ae 100644 |
49 |
--- a/app-antivirus/clamav/clamav-0.102.0-r2.ebuild |
50 |
+++ b/app-antivirus/clamav/clamav-0.102.1.ebuild |
51 |
@@ -43,11 +43,9 @@ DEPEND="${CDEPEND} |
52 |
RDEPEND="${CDEPEND} |
53 |
selinux? ( sec-policy/selinux-clamav )" |
54 |
|
55 |
-#DOCS=( docs/UserManual.md docs/UserManual ) |
56 |
-HTML_DOCS=( docs/html ) |
57 |
+HTML_DOCS=( docs/html/. ) |
58 |
|
59 |
PATCHES=( |
60 |
- "${FILESDIR}/${PN}-0.102.0-libxml2_pkgconfig.patch" #661328 |
61 |
"${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729 |
62 |
) |
63 |
|
64 |
@@ -71,15 +69,13 @@ src_configure() { |
65 |
# but that does not work |
66 |
# do not add this, since --disable-xml seems to override |
67 |
# --without-xml |
68 |
- JSONUSE="" |
69 |
+ JSONUSE="--without-libjson" |
70 |
|
71 |
- if [ use clamsubmit ] || [ use metadata-analysis-api ]; then |
72 |
+ if use clamsubmit || use metadata-analysis-api; then |
73 |
# either of those 2 requires libjson. |
74 |
# clamsubmit will be built as soon as libjson and curl are found |
75 |
# but we only install the binary if requested |
76 |
- JSONUSE="--with-libjson=/usr" |
77 |
- else |
78 |
- JSONUSE="--without-libjson" |
79 |
+ JSONUSE="--with-libjson=${EPREFIX}/usr" |
80 |
fi |
81 |
|
82 |
econf \ |
83 |
@@ -91,7 +87,6 @@ src_configure() { |
84 |
$(use_enable test check) \ |
85 |
$(use_with xml) \ |
86 |
$(use_with iconv) \ |
87 |
- $(use_with metadata-analysis-api libjson /usr) \ |
88 |
${JSONUSE} \ |
89 |
$(use_enable libclamav-only) \ |
90 |
--with-system-libmspack \ |
91 |
|
92 |
diff --git a/app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch b/app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch |
93 |
deleted file mode 100644 |
94 |
index 1a6303b5c8c..00000000000 |
95 |
--- a/app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch |
96 |
+++ /dev/null |
97 |
@@ -1,101 +0,0 @@ |
98 |
-https://bugs.gentoo.org/661328 |
99 |
- |
100 |
---- clamav-0.102.0/m4/reorganization/libs/xml.m4 |
101 |
-+++ clamav-0.102.0/m4/reorganization/libs/xml.m4 |
102 |
-@@ -4,85 +4,29 @@ |
103 |
- [AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])], |
104 |
- want_xml=$enableval, want_xml="auto") |
105 |
- |
106 |
--XML_HOME="" |
107 |
--xmlconfig="" |
108 |
- if test "X$want_xml" != "Xno"; then |
109 |
-- AC_MSG_CHECKING([for libxml2 installation]) |
110 |
-- AC_ARG_WITH([xml], |
111 |
-- AS_HELP_STRING([--with-xml@<:@=DIR@:>@], [path to directory containing libxml2 library |
112 |
-- @<:@default=/usr/local or /usr if not found in /usr/local@:>@]), |
113 |
-- [with_xml_val=$withval] |
114 |
-+ PKG_CHECK_MODULES([XML], [libxml-2.0], |
115 |
-+ [found_xml=yes], |
116 |
-+ [ |
117 |
-+ found_xml=no |
118 |
-+ AS_IF([test "x$want_xml" = xyes], |
119 |
-+ [AC_MSG_ERROR([--enable-xml set but cannot find libxml2])] |
120 |
-+ ) |
121 |
-+ ] |
122 |
- ) |
123 |
- |
124 |
-- AS_IF([test "x$with_xml_val" = "xno"], [XML_HOME=""], |
125 |
-- [test "x$with_xml_val" = "xyes"], [XML_HOME="/usr/local"], |
126 |
-- [XML_HOME="$with_xml_val"]) |
127 |
-- |
128 |
-- AS_IF([test "x$XML_HOME" != "x"], [ |
129 |
-- AS_IF([test ! -x "$XML_HOME/bin/xml2-config"], [XML_HOME=""]) |
130 |
-- ]) |
131 |
-- |
132 |
-- AS_IF([test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"], [ |
133 |
-- AS_IF([test -x "/usr/bin/xml2-config"], [XML_HOME="/usr"]) |
134 |
-- ]) |
135 |
-- |
136 |
-- if test "x$XML_HOME" != "x"; then |
137 |
-- AC_MSG_RESULT([$XML_HOME]) |
138 |
-- with_xml="yes" |
139 |
-- else |
140 |
-- AC_MSG_RESULT([not found]) |
141 |
-- fi |
142 |
-- |
143 |
-- found_xml="no" |
144 |
-- XMLCONF_VERSION="" |
145 |
-- XML_CPPFLAGS="" |
146 |
-- XML_LIBS="" |
147 |
-- case "$with_xml" in |
148 |
-- yes) AC_PATH_PROG([xmlconfig], [xml2-config]) |
149 |
-- if test "x$xmlconfig" = x ; then |
150 |
-- AC_MSG_NOTICE([can not locate xml2-config in PATH, will search default XML_HOME variants]) |
151 |
-- |
152 |
-- if test "x$XML_HOME" != "x"; then |
153 |
-- AC_MSG_CHECKING([xml2-config version]) |
154 |
-- XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`" |
155 |
-- |
156 |
-- if test "x%XMLCONF_VERSION" != "x"; then |
157 |
-- AC_MSG_RESULT([$XMLCONF_VERSION]) |
158 |
-- found_xml="yes" |
159 |
-- XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`" |
160 |
-- XML_LIBS="`$XML_HOME/bin/xml2-config --libs`" |
161 |
-- AS_ECHO("$XML_CPPFLAGS") |
162 |
-- AS_ECHO("$XML_LIBS") |
163 |
-- else |
164 |
-- AC_MSG_ERROR([xml2-config failed]) |
165 |
-- fi |
166 |
-- fi |
167 |
-- else |
168 |
-- found_xml="yes" |
169 |
-- XMLCONF_VERSION="`$xmlconfig --version`" |
170 |
-- XML_CPPFLAGS="`$xmlconfig --cflags`" |
171 |
-- XML_LIBS="`$xmlconfig --libs`" |
172 |
-- fi |
173 |
-- esac |
174 |
-- |
175 |
- working_xml="no" |
176 |
- if test "X$found_xml" != "Xno"; then |
177 |
-- |
178 |
-- readerresult="" |
179 |
-- if test "x$xmlconfig" = x ; then |
180 |
-- readerresult="$XML_HOME/include/libxml2/libxml/xmlreader.h" |
181 |
-- else |
182 |
-- readerresult="`$xmlconfig --prefix`/include/libxml2/libxml/xmlreader.h" |
183 |
-- fi |
184 |
-- |
185 |
-+ XML_HOME=$(${PKG_CONFIG} --variable prefix libxml-2.0) |
186 |
- AC_MSG_CHECKING([for xmlreader.h in $readerresult]) |
187 |
- |
188 |
-- if test ! -f "$readerresult"; then |
189 |
-+ if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then |
190 |
- AC_MSG_RESULT([not found]) |
191 |
- else |
192 |
- AC_MSG_RESULT([found]) |
193 |
- save_LIBS="$LIBS" |
194 |
- save_CPPFLAGS="$CPPFLAGS" |
195 |
-+ XML_CPPFLAGS="$XML_CFLAGS" |
196 |
- CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" |
197 |
- save_LDFLAGS="$LDFLAGS" |
198 |
- LDFLAGS="$LDFLAGS $XML_LIBS" |