app-antivirus/clamav: new version 0.102.1.

This new version fixes some major problems in the last one. The milter
isn't totally busted, a DoS was patched (CVE-2019-15961), we don't need
to patch the build system to detect libxml2, and fanotify should now
be found when it's there.

I've also tweaked the documentation location so that we don't wind up
with nested "html" directories, and stopped USE="-metadata-analysis-api"
from clobbering USE="clamsubmit" in the ebuild.

The mailing list reports that there are still intermittent test
failures and a ./configure bug, but this one might actually be usable.

Closes: https://bugs.gentoo.org/697686
Closes: https://bugs.gentoo.org/697688
Closes: https://bugs.gentoo.org/701094
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>

3 files changed, 5 insertions, 111 deletions

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 00830a7c63bc..6af7a532eee7 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,4 +1,4 @@
 DIST clamav-0.101.2.tar.gz 21722932 BLAKE2B 5c2960e678510a6f829fc9333e05a45a57a704e13eb407e0f890dd5553a1f9644eb3b1122c677755237b8c682127319d447a508087bc9130d14cd2cfec92896a SHA512 f9ea4589a8081acf7b6d454d1a068da05ae6574a9070a08f9438935795cb6dc084ffb9222b11fb1623f31962f859e6536a2f5bd1de29ef6b9b314efa5edc8c7e
 DIST clamav-0.101.3.tar.gz 21389753 BLAKE2B f254846dad40bd9dda650ece9dd672ca040fe4779b4f46a5cfa087808711055745d02c65f24da9589420e979a777bc435f68d25f6940ebf283cd0a8f240908b5 SHA512 285e6011ef5b68683daae7287005b2a615d7ee2fb9dac28d6db347cf7fe101da627aaec800366e83551f41afb78c6b08517def7aa30d0f0c347e54344b0b14d3
 DIST clamav-0.101.4.tar.gz 21408145 BLAKE2B 5eba85dcf203f56cbd943e479e660469dcc1972819674f5624207f4123ec74207b664cba3c9b0318665d261176da338f3c3fba9c938eeb626ce75174d525a43f SHA512 fae914a95b674fa6bdea044abec702401146590ca0aaaea1245deb1c4770641a794f60ff7b448b24d8c1923150cb7ba230848974837257c3a8ab20ea1e2f86d3
-DIST clamav-0.102.0.tar.gz 13211357 BLAKE2B b3ba01f7ff63dbb4fcba57955b3ea364b56da6b71c01770cb6fabbd48a60cf43935aa0a869ef8d96d8f7adc65c9ebc681d08e87c2e07bc7469584a0d9833a4fd SHA512 7228f5f572e5ca32a458c262a5d297694059de04cb4a64364dd92e1d2e4560d58263d05bfb2053641ea7521c4040bef5a49b3cea27e77b907c95195cf4a54d84
+DIST clamav-0.102.1.tar.gz 13215586 BLAKE2B 653e5506ed0b19c154038e960184abf2773a8a12a775dda81ce4f69fe7e58c457c39d85e24ce43bda9f09f43766c81af69d5462e7459077b0e4886f73a2a5ba2 SHA512 2d0cd2dece771ab8228771f9a95eb0342e756083a0107b2bef31bd2f5f46c36aa692e15d7eb2ea321f535ea4e18c8df043c8663ae350d40fbe1bdb4d073dcb90
diff --git a/app-antivirus/clamav/clamav-0.102.0-r2.ebuild b/app-antivirus/clamav/clamav-0.102.1.ebuild
index e768ec499d09..1236104e6ae8 100644
--- a/app-antivirus/clamav/clamav-0.102.0-r2.ebuild
+++ b/app-antivirus/clamav/clamav-0.102.1.ebuild
@@ -43,11 +43,9 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-clamav )"
 
-#DOCS=( docs/UserManual.md docs/UserManual )
-HTML_DOCS=( docs/html )
+HTML_DOCS=( docs/html/. )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.102.0-libxml2_pkgconfig.patch" #661328
 	"${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
 )
 
@@ -71,15 +69,13 @@ src_configure() {
 	# but that does not work
 	# do not add this, since --disable-xml seems to override
 	# --without-xml
-	JSONUSE=""
+	JSONUSE="--without-libjson"
 
-	if [ use clamsubmit ] || [ use metadata-analysis-api ]; then
+	if use clamsubmit || use metadata-analysis-api; then
 		# either of those 2 requires libjson.
 		# clamsubmit will be built as soon as libjson and curl are found
 		# but we only install the binary if requested
-		JSONUSE="--with-libjson=/usr"
-	else
-		JSONUSE="--without-libjson"
+		JSONUSE="--with-libjson=${EPREFIX}/usr"
 	fi
 
 	econf \
@@ -91,7 +87,6 @@ src_configure() {
 		$(use_enable test check) \
 		$(use_with xml) \
 		$(use_with iconv) \
-		$(use_with metadata-analysis-api libjson /usr) \
 		${JSONUSE} \
 		$(use_enable libclamav-only) \
 		--with-system-libmspack \
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
deleted file mode 100644
index 1a6303b5c8c2..000000000000
--- a/app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-https://bugs.gentoo.org/661328
-
---- clamav-0.102.0/m4/reorganization/libs/xml.m4
-+++ clamav-0.102.0/m4/reorganization/libs/xml.m4
-@@ -4,85 +4,29 @@
- [AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])],
- want_xml=$enableval, want_xml="auto")
- 
--XML_HOME=""
--xmlconfig=""
- if test "X$want_xml" != "Xno"; then
--  AC_MSG_CHECKING([for libxml2 installation])
--  AC_ARG_WITH([xml],
--    AS_HELP_STRING([--with-xml@<:@=DIR@:>@], [path to directory containing libxml2 library
--                    @<:@default=/usr/local or /usr if not found in /usr/local@:>@]),
--    [with_xml_val=$withval]
-+  PKG_CHECK_MODULES([XML], [libxml-2.0],
-+    [found_xml=yes],
-+    [
-+	found_xml=no
-+	AS_IF([test "x$want_xml" = xyes],
-+	    [AC_MSG_ERROR([--enable-xml set but cannot find libxml2])]
-+	)
-+    ]
-   )
- 
--  AS_IF([test "x$with_xml_val" = "xno"], [XML_HOME=""],
--    [test "x$with_xml_val" = "xyes"], [XML_HOME="/usr/local"],
--    [XML_HOME="$with_xml_val"])
--
--  AS_IF([test "x$XML_HOME" != "x"], [
--     AS_IF([test ! -x "$XML_HOME/bin/xml2-config"], [XML_HOME=""])
--     ])
--
--  AS_IF([test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"], [
--     AS_IF([test -x "/usr/bin/xml2-config"], [XML_HOME="/usr"])
--     ])
--
--  if test "x$XML_HOME" != "x"; then
--    AC_MSG_RESULT([$XML_HOME])
--    with_xml="yes"
--  else
--    AC_MSG_RESULT([not found])
--  fi
--
--  found_xml="no"
--  XMLCONF_VERSION=""
--  XML_CPPFLAGS=""
--  XML_LIBS=""
--  case "$with_xml" in
--    yes) AC_PATH_PROG([xmlconfig], [xml2-config])
--        if test "x$xmlconfig" = x ; then
--            AC_MSG_NOTICE([can not locate xml2-config in PATH, will search default XML_HOME variants])
--            
--            if test "x$XML_HOME" != "x"; then
--                AC_MSG_CHECKING([xml2-config version])
--                XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"
--
--                if test "x%XMLCONF_VERSION" != "x"; then
--                    AC_MSG_RESULT([$XMLCONF_VERSION])
--                    found_xml="yes"
--                    XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`"
--                    XML_LIBS="`$XML_HOME/bin/xml2-config --libs`"
--                    AS_ECHO("$XML_CPPFLAGS")
--                    AS_ECHO("$XML_LIBS")
--                else
--                    AC_MSG_ERROR([xml2-config failed])
--                fi
--            fi
--        else
--            found_xml="yes"
--            XMLCONF_VERSION="`$xmlconfig --version`"
--            XML_CPPFLAGS="`$xmlconfig --cflags`"
--            XML_LIBS="`$xmlconfig --libs`"
--        fi
--  esac
--
-   working_xml="no"
-   if test "X$found_xml" != "Xno"; then
--
--    readerresult=""
--    if test "x$xmlconfig" = x ; then
--        readerresult="$XML_HOME/include/libxml2/libxml/xmlreader.h"
--    else
--        readerresult="`$xmlconfig --prefix`/include/libxml2/libxml/xmlreader.h"
--    fi
--    
-+    XML_HOME=$(${PKG_CONFIG} --variable prefix libxml-2.0)
-     AC_MSG_CHECKING([for xmlreader.h in $readerresult])
-     
--    if test ! -f "$readerresult"; then
-+    if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then
-       AC_MSG_RESULT([not found])
-     else
-       AC_MSG_RESULT([found])
-       save_LIBS="$LIBS"
-       save_CPPFLAGS="$CPPFLAGS"
-+      XML_CPPFLAGS="$XML_CFLAGS"
-       CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
-       save_LDFLAGS="$LDFLAGS"
-       LDFLAGS="$LDFLAGS $XML_LIBS"