summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Orlitzky <mjo@gentoo.org>2019-11-24 22:02:23 -0500
committerMichael Orlitzky <mjo@gentoo.org>2019-11-24 22:54:20 -0500
commit0bed854e02879dce0dd783dafb9ab175eb7ca443 (patch)
tree27f367574d92cae7ec2bb261fa600d1e443eee56 /app-antivirus/clamav/files
parentsys-auth/google-authenticator: Version bump 1.06. (diff)
downloadgentoo-0bed854e02879dce0dd783dafb9ab175eb7ca443.tar.gz
gentoo-0bed854e02879dce0dd783dafb9ab175eb7ca443.tar.bz2
gentoo-0bed854e02879dce0dd783dafb9ab175eb7ca443.zip
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>
Diffstat (limited to 'app-antivirus/clamav/files')
-rw-r--r--app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch101
1 files changed, 0 insertions, 101 deletions
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"