gentoo resync : 14.05.2020

20 files changed, 372 insertions, 584 deletions

diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index e29853e608af..48514f1774b4 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav-unofficial-sigs/Manifest b/app-antivirus/clamav-unofficial-sigs/Manifest
deleted file mode 100644
index 327175d9c80c..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX clamav-unofficial-sigs-7.0.1-disable-run-as-root.patch 1500 BLAKE2B c0b4faaa99fea8dcc2874ebed2b42c559b5672f7f1db7219415b99dd55498a1668a57ecfe95452ac2ec948aff30ec0b7ed8d56a51ca029c3421d6ce368b4bd4b SHA512 a580de4379935fada201c66db4211637f6c5bf15a4a4c0a25f1681cdb5b5d3f795159b07d4b754719e6ae35d0296d71cff3a0794f23caf99f2c312fd46e8fd88
-AUX clamav-unofficial-sigs-7.0.1-fix-mbl-database-name.patch 1264 BLAKE2B c61ea2136b72d5f2bd93d977fb4f7b0ee8aa313f0130f1434cef3cceb652a5791ae1d25ac9efcf26fa0255459c030b52d5c24c5a2f9c9a92b84fa1f81ae8cb41 SHA512 8cfc47911219c8346605272a80b2f52262581342693ee7dec0654e5542f1f73be27a022c36e9af0ba674e2c6a717fd1870cee77416eba77568b3e7c5712b1ba2
-AUX clamav-unofficial-sigs-7.0.1-fix-mbl-url.patch 1000 BLAKE2B 5a90e43d592a38d457eb56e0480b383ce1b1cd12153722f804fb041ffd51d8a55698e22e2f8e9d15bb71147f5f6f4437804a051facd7945f9cd141098bd51fcd SHA512 716f6f1b13afc07a6160b1a2cd53331d7be4487b6c4ece33e247d923d267d90e6a36eb1c06e3e38afc77e9d1750c13e58dfb312f5549c8a878ad6378bdc18fbc
-AUX clamav-unofficial-sigs-7.0.1.man.8 4675 BLAKE2B afc32188c3542df6b944bb60240f378a8bfffe0aab4933552dd363ad041479959b747eb2571e161fb519a753530dc943d3902bcaac79e3058befe2305f28066e SHA512 7b4e5c7d2ffe51898736d9f86fe7f1cc7ae585015d8aa5960fd48b4f7a4344f5b2e307d0548d87d6533a731c1b6361bd0653824d76db4f533475cd34af501a31
-AUX clamav-unofficial-sigs.8 4568 BLAKE2B 3bb0a56c11d733d0727c38588fb1b9b38b679e32cf9ac0b2c277f623e3a3508df2aa0ac65497fa0026d43a629ec69a0cad386ca57b9cb8178b30b3061fc2abf1 SHA512 8e688281c6918ea8c13f5d76c63fee65b6e3378ca1d2e92033a741b7f02d12607d838484075e0d3ae8d99680a5b235acee062fc80c63f7e5577cfee575b56573
-AUX clamav-unofficial-sigs.crond 736 BLAKE2B cc727c674b863d4426e7372b6140d3135b8a6aab57da5da3273807cecce88e61baf8f3ad642dad3e5287b88bd1072f80ad2d4758cd43405dd21b8e547b6fb5b7 SHA512 3545ff3962b4db3f96f12409dbe069e93d573c63a3e8d6a69e8f9bc671dfb995250cbe30538626f1712199ac041e9c2f29da1dae3dad0cdae0aa5cee77877b70
-AUX clamav-unofficial-sigs.logrotate 109 BLAKE2B 662b268f5332f088670fb762dd5162c0fccba68ca3fad5d089f2330057f1d52c35785924e56a8174c3d9c2d7d6c9232f3d41adb83c2cd88c55d096b764781ed8 SHA512 3d79caf1bbc29218aacda9c6c411b6b9e827644c3a89a3a1b9e0d89baeb7927cdbda3322c9b5a5186e53f0efa598e165d10cfa698936a687bd6279f6e3866830
-AUX clamav-unofficial-sigs.service 432 BLAKE2B 4d1fd7f47d8698a19e9b52e265d05543176e096877e1b92418b9685da64ea1fed45fe13837c9359ce74ea51dd166d3cdd5756bb605bfc40c7679fff3bf228b5c SHA512 7262b760b8637e505096958d4233ce2c6ace337ce37be0bf703e70fb408d36d98da3fc84d8d74096c04094537597dd8f7c84a61a4f9504879d43302804fe8bf9
-AUX clamav-unofficial-sigs.timer 336 BLAKE2B e7abc9f011becab462dd23147843bb7e3ab23fee13babd41e8958eeab42db018980cdee1404cdeafde0e2ac87a4fde0ee9aa53e90de0bf191a12d688ebc715e3 SHA512 a921b065671bb053f135a4a44e268d4002acf1a42373304253fd3595fa414df9cbfd91c7a54b4be30012879c9446e0e2de7ca86833b6c03775e434a41ecb0e5d
-DIST clamav-unofficial-sigs-5.6.2.tar.gz 50931 BLAKE2B 6fea42f8f76ae5344c2b96c9203d2b09e755573d03f2b9d3d9ee2a488150fbb6f598e052b730daf12c551920a71fd8daad1dc10002fca12fa4a74554cf7d445e SHA512 79978db065a22d778490d0a2673f5a0bb7ab73e42de64563e7d26ac23459f7e5b2e73b0548e1ea6483e3c5f43eed65cdbc6814037cc0c46a339366a0150e5427
-DIST clamav-unofficial-sigs-6.0.1.tar.gz 52262 BLAKE2B 9523da749e88c5e93f0986d7d4a234c3b1eff7c207ceb266e63cd76d7cffdf4a85aedf90aa746f7e1c82be97018f40896bbaa2dfd8f749f3c167d3bff74293d7 SHA512 d4f619628c9b2804a6d5ad533adaad72e323bb0604334c045cf92fc550ffb114493653d097b68337b33f51dc1215dc073b4ec9dc42abea8707cb03aefa40b289
-DIST clamav-unofficial-sigs-7.0.1.tar.gz 59517 BLAKE2B 36da6d7748cd7fcf35dde4790a8fb6777a97a6c0a7b2c080e0f0ac939041b5fd2372f0d58fb00558a7f57db78866c3235205e2cb8a8083575efcf1a5e73c9a3b SHA512 2cba341bce50b03d17f46662b499a3378d4e5750f4abe837bbddee5c671636553660723243c4b90de96c84210926f6406f554b7936600c3ae618644af40bf802
-EBUILD clamav-unofficial-sigs-5.6.2.ebuild 1846 BLAKE2B 2a8aacda234149946d22da47d995b696f46bd6d89bc65cbcafe47e650972f688b831da308b60629a06dd5aa1322c804a341ecd0131722f241c9e9f25bda36591 SHA512 a7fac4e6b1c7f406aaa0051226fc2dd78e17f060fcc22a6229fef2fd3435c53a50b39030e672ac7139f394422e04f6baf2360415ce2ce9faf91d0289261d7f74
-EBUILD clamav-unofficial-sigs-6.0.1-r5.ebuild 2368 BLAKE2B 54218e3060b1156de9db3a32293c60e7d1860017f79ef1637e4131b97ccd96cc5e04833ebc27566b795f6d9d994a7164889841f015d8126bf0f716e922564e6d SHA512 8fc0c7f8b1567f4e26b3cba988a3f4ae41ee84f997b696e36596b813094ecd101f37be6960333a078b46122158c447963daa5d0b7009463526dfc8892a7f0d07
-EBUILD clamav-unofficial-sigs-7.0.1.ebuild 3362 BLAKE2B a587708cd9bba3edddc69cc014a0bfb313bfb0f4620fa91d2e19b2f1100c8968e3e9149542a118ab514ef266af35bf874da30cd712a6395b46a39b807915c837 SHA512 ffbb490e0c6c13065618b2ae381f24c2035dc8ccbc45a88f3709eaec907a63dca8627408ac068d9999ec36e9b6c0429e58f4c7d347532479d9ebcfec08b70e15
-MISC metadata.xml 699 BLAKE2B f053d76f76bc2c2f38308ba59f7cff4c991ab16a62ea63c255e543ff1ba4964cf24be6c3cf5b9f4dea82579d637c84d8c072bbc475f4d6b12665d35d00b0e7d1 SHA512 8a1a737b5012f5489cb24230f20d757f861da8ec125bd19e2aa22a5fb7f932e36d17ca771796e3eb167d3141487851e83d3a83d45e3c6a5a05ab0ce4b7738e0b
diff --git a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild
deleted file mode 100644
index b42977e7bcaa..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-DESCRIPTION="Download and install third-party clamav signatures"
-HOMEPAGE="https://github.com/extremeshok/clamav-unofficial-sigs"
-SRC_URI="https://github.com/extremeshok/clamav-unofficial-sigs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# The script relies on either net-misc/socat, or Perl's
-# IO::Socket::UNIX. We already depend on Perl, and Gentoo's Perl ships
-# with IO::Socket::UNIX, so we can leave out net-misc/socat here.
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-	dev-lang/perl
-	net-dns/bind-tools
-	|| ( net-misc/wget net-misc/curl )"
-
-src_install() {
-	dosbin "${PN}.sh"
-
-	# The script's working directory (set in the conf file). By default,
-	# it runs as clamav/clamav. We set the owner/group later, in
-	# pkg_preinst, after the user/group is sure to exist (because we
-	# create them otherwise).
-	keepdir "/var/lib/${PN}"
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}/${PN}.logrotate"
-
-	insinto "/etc/${PN}"
-	doins config/{master,user}.conf
-	newins config/os.gentoo.conf os.conf
-
-	doman "${FILESDIR}/${PN}.8"
-	dodoc README.md
-}
-
-pkg_preinst() {
-	# Should agree with app-antivirus/clamav. We don't actually need
-	# clamav to function, so it isn't one of our dependencies, and
-	# that's why we might need to create its user ourselves.
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-	fowners clamav:clamav "/var/lib/${PN}"
-}
-
-pkg_postinst() {
-	elog ''
-	elog "You will need to select databases in /etc/${PN}/master.conf."
-	elog "For details, please see the ${PN}(8) manual page."
-	elog ''
-	elog 'An up-to-date description of the available Sanesecurity'
-	elog 'databases is available at,'
-	elog ''
-	elog '  http://sanesecurity.com/usage/signatures/'
-	elog ''
-}
diff --git a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-6.0.1-r5.ebuild b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-6.0.1-r5.ebuild
deleted file mode 100644
index 1660dbdee6cd..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-6.0.1-r5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Download and install third-party clamav signatures"
-HOMEPAGE="https://github.com/extremeshok/clamav-unofficial-sigs"
-SRC_URI="https://github.com/extremeshok/clamav-unofficial-sigs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cron"
-
-# Require acct-{user,group}/clamav at build time so that we can set
-# the permissions on /var/lib/${PN} in src_install rather than in
-# pkg_postinst; calling "chown" on the live filesystem scares me.
-DEPEND="acct-group/clamav
-	acct-user/clamav"
-
-# The script relies on either net-misc/socat, or Perl's
-# IO::Socket::UNIX. We already depend on Perl, and Gentoo's Perl ships
-# with IO::Socket::UNIX, so we can leave out net-misc/socat here.
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-	dev-lang/perl
-	net-dns/bind-tools
-	|| ( net-misc/wget net-misc/curl )"
-
-src_install() {
-	dobin "${PN}.sh"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
-	insinto "/etc/${PN}"
-	doins config/{master,user}.conf
-	newins config/os.gentoo.conf os.conf
-
-	doman "${FILESDIR}/${PN}.8"
-	dodoc README.md
-
-	if use cron; then
-		# Beware, this directory is not completely standard. However,
-		# we need this to run as "clamav" with a non-default shell and
-		# home directory (bug 694054), and this seems like the most
-		# reliable way to accomplish that.
-		insinto "/etc/cron.d"
-		newins "${FILESDIR}/${PN}.crond" "${PN}"
-	else
-		dodoc "${FILESDIR}/${PN}.crond"
-	fi
-
-	# Install the systemd service and timer unconditionally, because
-	# the timer is disabled by default (and won't annoy people until
-	# after they've configured the script).
-	systemd_dounit "${FILESDIR}/${PN}".{service,timer}
-
-	# The script's working directory, as set in the configuration
-	# file. By default, the script runs as clamav:clamav because
-	# it needs write access to the clamav databases.
-	diropts -o clamav -g clamav
-	keepdir "/var/lib/${PN}"
-}
-
-pkg_postinst() {
-	elog ''
-	elog "You will need to select databases in /etc/${PN}/master.conf."
-	elog "For details, please see the ${PN}(8) manual page."
-	elog ''
-	elog 'An up-to-date description of the available Sanesecurity'
-	elog 'databases is available at,'
-	elog ''
-	elog '  http://sanesecurity.com/usage/signatures/'
-	elog ''
-}
diff --git a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-7.0.1.ebuild b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-7.0.1.ebuild
deleted file mode 100644
index d906ed530acb..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-7.0.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Download and install third-party clamav signatures"
-HOMEPAGE="https://github.com/extremeshok/clamav-unofficial-sigs"
-SRC_URI="https://github.com/extremeshok/clamav-unofficial-sigs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cron"
-
-# Require acct-{user,group}/clamav at build time so that we can set
-# the permissions on /var/lib/${PN} in src_install rather than in
-# pkg_postinst; calling "chown" on the live filesystem scares me.
-DEPEND="acct-group/clamav
-	acct-user/clamav"
-
-# The script relies on either net-misc/socat, or Perl's
-# IO::Socket::UNIX. We already depend on Perl, and Gentoo's Perl ships
-# with IO::Socket::UNIX, so we can leave out net-misc/socat here.
-#
-# Recent versions will crash if you don't have "clamscan" available,
-# so we are forced to depend on app-antivirus/clamav finally.
-RDEPEND="${DEPEND}
-	app-antivirus/clamav
-	app-crypt/gnupg
-	dev-lang/perl
-	net-dns/bind-tools
-	|| ( net-misc/wget net-misc/curl )"
-
-# This script is cccrrraaaaaaazzzzzzzzyyyyyy. It does a million
-# insecure things. Let's not accidentally run it as root.
-PATCHES=(
-	"${FILESDIR}/${P}-disable-run-as-root.patch"
-	"${FILESDIR}/${P}-fix-mbl-database-name.patch"
-	"${FILESDIR}/${P}-fix-mbl-url.patch"
-)
-
-src_prepare() {
-	default
-
-	# https://github.com/extremeshok/clamav-unofficial-sigs/pull/301
-	echo 'allow_upgrades="no"' >> config/os/os.gentoo.conf || die
-	echo 'allow_update_checks="no"' >> config/os/os.gentoo.conf || die
-}
-
-src_install() {
-	dobin "${PN}.sh"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
-	insinto "/etc/${PN}"
-	doins config/{master,user}.conf
-	newins config/os/os.gentoo.conf os.conf
-
-	# To generate the man page, you have to first install the package,
-	# and then issue some ridiculous command like
-	#
-	# $ sudo su -s /bin/sh \
-	#           -c 'man_dir=/tmp clamav-unofficial-sigs.sh --install-man' \
-	#           clamav
-	#
-	# That'll stick it in /tmp, which is unsafe-ish, but the example is
-	# easily modified.
-	newman "${FILESDIR}/${P}.man.8" "${PN}.8"
-	dodoc README.md
-
-	if use cron; then
-		# Beware, this directory is not completely standard. However,
-		# we need this to run as "clamav" with a non-default shell and
-		# home directory (bug 694054), and this seems like the most
-		# reliable way to accomplish that.
-		insinto "/etc/cron.d"
-		newins "${FILESDIR}/${PN}.crond" "${PN}"
-	else
-		dodoc "${FILESDIR}/${PN}.crond"
-	fi
-
-	# Install the systemd service and timer unconditionally, because
-	# the timer is disabled by default (and won't annoy people until
-	# after they've configured the script).
-	systemd_dounit "${FILESDIR}/${PN}".{service,timer}
-
-	# The script's working directory, as set in the configuration
-	# file. By default, the script runs as clamav:clamav because
-	# it needs write access to the clamav databases.
-	diropts -o clamav -g clamav
-	keepdir "/var/lib/${PN}"
-}
-
-pkg_postinst() {
-	elog ''
-	elog "You will need to select databases in /etc/${PN}/master.conf."
-	elog "For details, please see the ${PN}(8) manual page."
-	elog ''
-	elog 'An up-to-date description of the available Sanesecurity'
-	elog 'databases is available at,'
-	elog ''
-	elog '  http://sanesecurity.com/usage/signatures/'
-	elog ''
-}
diff --git a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs-7.0.1-disable-run-as-root.patch b/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs-7.0.1-disable-run-as-root.patch
deleted file mode 100644
index 2b40c982309b..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs-7.0.1-disable-run-as-root.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5235a5e518a1b17f50eb0f56c088f3808d939626 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 4 Feb 2020 19:34:56 -0500
-Subject: [PATCH 1/1] clamav-unofficial-sigs.sh: disable running as root.
-
-The only way I'm going to let this be installed on my machine is if
-it never runs as root. The shit that it does is insane (a priori)
-and also implemented insecurely. There's no good reason to run the
-script as root on Gentoo anyway. A cron job is provided for you,
-or you can use "su -s /bin/bash -c ... clamav" to run it as the
-clamav user.
----
- clamav-unofficial-sigs.sh | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
-index aa70db1..60d305b 100644
---- a/clamav-unofficial-sigs.sh
-+++ b/clamav-unofficial-sigs.sh
-@@ -3,6 +3,16 @@
- # shellcheck disable=SC2120
- # shellcheck disable=SC2128
- # shellcheck disable=SC2154
-+
-+if [[ ${EUID} -eq 0 ]]; then
-+    exec 1>&2
-+    echo "This script has been patched by the Gentoo maintainer to disable"
-+    echo "running it as root (effective UID 0). When run as root, the script"
-+    echo "performs a number of operations insecurely. You should never need"
-+    echo "to run this as root on Gentoo in the first place."
-+    exit 1;
-+fi
-+
- ################################################################################
- # This is property of eXtremeSHOK.com
- # You are free to use, modify and distribute, however you may not remove this notice.
--- 
-2.24.1
-
diff --git a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs-7.0.1-fix-mbl-database-name.patch b/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs-7.0.1-fix-mbl-database-name.patch
deleted file mode 100644
index c991dacb412f..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs-7.0.1-fix-mbl-database-name.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 837439354cd4692a7228f9f356e0c4acd32202f3 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 4 Feb 2020 20:11:16 -0500
-Subject: [PATCH 1/1] clamav-unofficial-sigs.sh: fix malwarepatrol extended
- database name.
-
-The database suffix needs to be ".db" regardless of whether you choose
-the "basic" signatures or the "extended" ones. This patch is a quick
-fix, and just forces the correct name at the beginning of the script.
-
-Issue: https://github.com/extremeshok/clamav-unofficial-sigs/issues/300
----
- clamav-unofficial-sigs.sh | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
-index aa70db1..d8031c8 100644
---- a/clamav-unofficial-sigs.sh
-+++ b/clamav-unofficial-sigs.sh
-@@ -2235,11 +2235,7 @@ else
-   fi
- fi
- 
--if [ $malwarepatrol_list == "clamav_basic" ] ; then
--  malwarepatrol_db="malwarepatrol.db"
--else
--  malwarepatrol_db="malwarepatrol.ndb"
--fi
-+malwarepatrol_db="malwarepatrol.db"
- malwarepatrol_url="${malwarepatrol_url}?receipt=${malwarepatrol_receipt_code}&product=${malwarepatrol_product_code}&list=${malwarepatrol_list}"
- 
- # If "ham_dir" variable is set, then create initial whitelist files (skipped if first-time script run).
--- 
-2.24.1
-
diff --git a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs-7.0.1-fix-mbl-url.patch b/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs-7.0.1-fix-mbl-url.patch
deleted file mode 100644
index e647ec9beea6..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs-7.0.1-fix-mbl-url.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From be934c77f029aa52c84ede976cf7ab91bf053c03 Mon Sep 17 00:00:00 2001
-From: Michael Urspringer <michael@urspringer.de>
-Date: Sun, 26 Jan 2020 11:46:07 +0100
-Subject: [PATCH] Fixed wrong download URL for MalwarePatrol
-
----
- clamav-unofficial-sigs.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clamav-unofficial-sigs.sh b/clamav-unofficial-sigs.sh
-index aa70db1..c2f31d6 100644
---- a/clamav-unofficial-sigs.sh
-+++ b/clamav-unofficial-sigs.sh
-@@ -2979,7 +2979,7 @@ if [ "$malwarepatrol_enabled" == "yes" ] ; then
-             xshok_pretty_echo_and_log "Checking for updated MalwarePatrol database file: ${malwarepatrol_db}"
-             malwarepatrol_db_update="0"
- 
--            xshok_file_download "${work_dir_malwarepatrol}/${malwarepatrol_db}" "${malwarepatrol_url}&receipt=${malwarepatrol_receipt_code}"
-+            xshok_file_download "${work_dir_malwarepatrol}/${malwarepatrol_db}" "${malwarepatrol_url}"
- 
-             ret="$?"
-             if [ "$ret" -eq 0 ] ; then
diff --git a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs-7.0.1.man.8 b/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs-7.0.1.man.8
deleted file mode 100644
index 7f5555e27f06..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs-7.0.1.man.8
+++ /dev/null
@@ -1,77 +0,0 @@
-
-.\" Manual page for eXtremeSHOK.com ClamAV Unofficial Signature Updater
-.TH clamav-unofficial-sigs 8 "2020-01-25" "Version: 7.0.1" "SCRIPT COMMANDS"
-.SH NAME
-clamav-unofficial-sigs \- Download, test, and install third-party ClamAV signature databases.
-.SH SYNOPSIS
-.B clamav-unofficial-sigs
-.RI [ options ]
-.SH DESCRIPTION
-\fBclamav-unofficial-sigs\fP provides a simple way to download, test, and update third-party signature databases provided by Sanesecurity, FOXHOLE, OITC, Scamnailer, BOFHLAND, CRDF, Porcupine, Securiteinfo, MalwarePatrol, Yara-Rules Project, etc. It will also generate and install cron, logrotate, and man files.
-.SH UPDATES
-Script updates can be found at: \fBhttps://github.com/extremeshok/clamav-unofficial-sigs\fP
-.SH OPTIONS
-This script follows the standard GNU command line syntax.
-.LP
-\fB Usage: clamav\-unofficial\-sigs.sh \fR [OPTION] [PATH|FILE]
-.TP
-\fB \-c, \-\-config \fR Use a specific configuration file or directory   eg: '\-c /your/dir' or ' \-c /your/file.name'    Note: If a directory is specified the directory must contain atleast:    master.conf, os.conf or user.conf   Default Directory: /etc/clamav\-unofficial\-sigs
-.TP
-\fB \-F, \-\-force \fR Force all databases to be downloaded, could cause ip to be blocked
-.TP
-\fB \-h, \-\-help \fR Display this script's help and usage information
-.TP
-\fB \-V, \-\-version \fR Output script version and date information
-.TP
-\fB \-v, \-\-verbose \fR Be verbose, enabled when not run under cron
-.TP
-\fB \-s, \-\-silence \fR Only output error messages, enabled when run under cron
-.TP
-\fB \-d, \-\-decode\-sig \fR Decode a third\-party signature either by signature name   (eg: Sanesecurity.Junk.15248) or hexadecimal string.   This flag will 'NOT' decode image signatures
-.TP
-\fB \-e, \-\-encode\-string \fR Hexadecimal encode an entire input string that can   be used in any '*.ndb' signature database file
-.TP
-\fB \-f, \-\-encode\-formatted \fR Hexadecimal encode a formatted input string containing   signature spacing fields '{}, (), *', without encoding   the spacing fields, so that the encoded signature   can be used in any '*.ndb' signature database file
-.TP
-\fB \-g, \-\-gpg\-verify \fR GPG verify a specific Sanesecurity database file   eg: '\-g filename.ext' (do not include file path)
-.TP
-\fB \-i, \-\-information \fR Output system and configuration information for   viewing or possible debugging purposes
-.TP
-\fB \-m, \-\-make\-database \fR Make a signature database from an ascii file containing   data strings, with one data string per line.  Additional   information is provided when using this flag
-.TP
-\fB \-t, \-\-test\-database \fR Clamscan integrity test a specific database file   eg: '\-t filename.ext' (do not include file path)
-.TP
-\fB \-o, \-\-output\-triggered \fR If HAM directory scanning is enabled in the script's   configuration file, then output names of any third\-party   signatures that triggered during the HAM directory scan
-.TP
-\fB \-w, \-\-whitelist <signature\-name> \fR Adds a signature whitelist entry in the newer ClamAV IGN2   format to 'my\-whitelist.ign2' in order to temporarily resolve   a false\-positive issue with a specific third\-party signature.   Script added whitelist entries will automatically be removed   if the original signature is either modified or removed from   the third\-party signature database
-.TP
-\fB \-\-check\-clamav \fR If ClamD status check is enabled and the socket path is correctly   specifiedthen test to see if clamd is running or not
-.TP
-\fB \-\-upgrade \fR Upgrades this script and master.conf to the latest available version
-.TP
-\fB \-\-install\-all \fR Install and generate the cron, logroate and man files, autodetects the values   based on your config files
-.TP
-\fB \-\-install\-cron \fR Install and generate the cron file, autodetects the values   based on your config files
-.TP
-\fB \-\-install\-logrotate \fR Install and generate the logrotate file, autodetects the   values based on your config files
-.TP
-\fB \-\-install\-man \fR Install and generate the man file, autodetects the   values based on your config files
-.TP
-\fB \-\-remove\-script \fR Remove the clamav\-unofficial\-sigs script and all of   its associated files and databases from the system
-.TP
-.SH SEE ALSO
-.BR clamd (8),
-.BR clamscan (1)
-.SH COPYRIGHT
-Copyright (c) Adrian Jon Kriel :: admin@extremeshok.com
-.TP
-You are free to use, modify and distribute, however you may not remove this notice.
-.SH LICENSE
-BSD (Berkeley Software Distribution)
-.SH BUGS
-Report bugs to \fBhttps://github.com/extremeshok/clamav-unofficial-sigs\fP
-.SH AUTHOR
-Adrian Jon Kriel :: admin@extremeshok.com
-Originially based on Script provide by Bill Landry
-
-
diff --git a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.8 b/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.8
deleted file mode 100644
index d7cd1926f2fa..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.8
+++ /dev/null
@@ -1,75 +0,0 @@
-
-.\" Manual page for eXtremeSHOK.com ClamAV Unofficial Signature Updater
-.TH clamav-unofficial-sigs 8 "07 May 2016" "Version: 5.3.0" "SCRIPT COMMANDS"
-.SH NAME
-clamav-unofficial-sigs \- Download, test, and install third-party ClamAV signature databases.
-.SH SYNOPSIS
-.B clamav-unofficial-sigs
-.RI [ options ]
-.SH DESCRIPTION
-\fBclamav-unofficial-sigs\fP provides a simple way to download, test, and update third-party signature databases provided by Sanesecurity, FOXHOLE, OITC, Scamnailer, BOFHLAND, CRDF, Porcupine, Securiteinfo, MalwarePatrol, Yara-Rules Project, etc. It will also generate and install cron, logrotate, and man files.
-.SH UPDATES
-Script updates can be found at: \fBhttps://github.com/extremeshok/clamav-unofficial-sigs\fP
-.SH OPTIONS
-This script follows the standard GNU command line syntax.
-.LP
-\fB Usage: clamav\-unofficial\-sigs.sh \fR [OPTION] [PATH|FILE]
-.TP
-\fB \-c, \-\-config \fR Use a specific configuration file or directory   eg: '\-c /your/dir' or ' \-c /your/file.name'    Note: If a directory is specified the directory must contain atleast:    master.conf, os.conf or user.conf   Default Directory: configgentoo
-.TP 
-\fB \-F, \-\-force \fR Force all databases to be downloaded, could cause ip to be blocked
-.TP 
-\fB \-h, \-\-help \fR Display this script's help and usage information
-.TP 
-\fB \-V, \-\-version \fR Output script version and date information
-.TP 
-\fB \-v, \-\-verbose \fR Be verbose, enabled when not run under cron
-.TP 
-\fB \-s, \-\-silence \fR Only output error messages, enabled when run under cron
-.TP 
-\fB \-d, \-\-decode\-sig \fR Decode a third\-party signature either by signature name   (eg: Sanesecurity.Junk.15248) or hexadecimal string.   This flag will 'NOT' decode image signatures
-.TP 
-\fB \-e, \-\-encode\-string \fR Hexadecimal encode an entire input string that can   be used in any '*.ndb' signature database file
-.TP 
-\fB \-f, \-\-encode\-formatted \fR Hexadecimal encode a formatted input string containing   signature spacing fields '{}, (), *', without encoding   the spacing fields, so that the encoded signature   can be used in any '*.ndb' signature database file
-.TP 
-\fB \-g, \-\-gpg\-verify \fR GPG verify a specific Sanesecurity database file   eg: '\-g filename.ext' (do not include file path)
-.TP 
-\fB \-i, \-\-information \fR Output system and configuration information for   viewing or possible debugging purposes
-.TP 
-\fB \-m, \-\-make\-database \fR Make a signature database from an ascii file containing   data strings, with one data string per line.  Additional   information is provided when using this flag
-.TP 
-\fB \-t, \-\-test\-database \fR Clamscan integrity test a specific database file   eg: '\-s filename.ext' (do not include file path)
-.TP 
-\fB \-o, \-\-output\-triggered \fR If HAM directory scanning is enabled in the script's   configuration file, then output names of any third\-party   signatures that triggered during the HAM directory scan
-.TP 
-\fB \-w, \-\-whitelist \fR Adds a signature whitelist entry in the newer ClamAV IGN2   format to 'my\-whitelist.ign2' in order to temporarily resolve   a false\-positive issue with a specific third\-party signature.   Script added whitelist entries will automatically be removed   if the original signature is either modified or removed from   the third\-party signature database
-.TP 
-\fB \-\-check\-clamav \fR If ClamD status check is enabled and the socket path is correctly   specifiedthen test to see if clamd is running or not
-.TP 
-\fB \-\-install\-all \fR Install and generate the cron, logroate and man files, autodetects the values   based on your config files
-.TP
-\fB \-\-install\-cron \fR Install and generate the cron file, autodetects the values   based on your config files
-.TP 
-\fB \-\-install\-logrotate \fR Install and generate the logrotate file, autodetects the   values based on your config files
-.TP 
-\fB \-\-install\-man \fR Install and generate the man file, autodetects the   values based on your config files
-.TP 
-\fB \-\-remove\-script \fR Remove the clamav\-unofficial\-sigs script and all of   its associated files and databases from the system
-.TP 
-.SH SEE ALSO
-.BR clamd (8),
-.BR clamscan (1)
-.SH COPYRIGHT
-Copyright (c) Adrian Jon Kriel :: admin@extremeshok.com
-.TP
-You are free to use, modify and distribute, however you may not remove this notice.
-.SH LICENSE
-BSD (Berkeley Software Distribution)
-.SH BUGS
-Report bugs to \fBhttps://github.com/extremeshok/clamav-unofficial-sigs\fP
-.SH AUTHOR
-Adrian Jon Kriel :: admin@extremeshok.com
-Originially based on Script provide by Bill Landry
-
-
diff --git a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.crond b/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.crond
deleted file mode 100644
index 6c35c18e74b0..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.crond
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Run clamav-unofficial-sigs hourly.
-#
-# This file should be copied to /etc/cron.d rather than, say,
-# /etc/cron.hourly because it needs to run as the clamav user (to
-# alter the databases), but the default settings for that user in
-# Gentoo are insufficient (see bug 694054).
-#
-# In particular, the clamav user needs a Bash shell and a home
-# directory since clamav-unofficial-sigs is written in Bash and
-# because otherwise cron will complain about trying to chdir to a
-# nonexistent home directory. When run out of /etc/cron.d, we can set
-# HOME and SHELL to appropriate values, unlike with scripts in
-# /etc/cron.hourly.
-#
-HOME=/var/lib/clamav-unofficial-sigs
-SHELL=/bin/bash
-
-01 * * * * clamav /usr/bin/clamav-unofficial-sigs.sh
diff --git a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.logrotate b/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.logrotate
deleted file mode 100644
index 1d18581588de..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.logrotate
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/clamav-unofficial-sigs/clamav-unofficial-sigs.log {
-     create 0640 clamav clamav
-     missingok
-}
diff --git a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.service b/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.service
deleted file mode 100644
index 51727dafc9ff..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.service
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Service file corresponding to clamav-unofficial-sigs.timer.
-# Upstream provides a similar file, but with the wrong path
-# and running as root, so it's just less of a headache to
-# include our own.
-#
-
-[Unit]
-Description=ClamAV unofficial signature update service
-Documentation=man:clamav-unofficial-sigs(8)
-
-[Service]
-ExecStart=bash /usr/bin/clamav-unofficial-sigs.sh
-User=clamav
-WorkingDirectory=/var/lib/clamav-unofficial-sigs
diff --git a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.timer b/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.timer
deleted file mode 100644
index 299ffd841329..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/files/clamav-unofficial-sigs.timer
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Run clamav-unofficial-sigs.service every hour, at 45 minutes past the hour.
-# We do not include an [Install] section because this package does not
-# technically depend on clamav to function.
-#
-
-[Unit]
-Description=ClamAV unofficial signature update timer
-Documentation=man:clamav-unofficial-sigs(8)
-
-[Timer]
-OnCalendar=*-*-* *:45:00
diff --git a/app-antivirus/clamav-unofficial-sigs/metadata.xml b/app-antivirus/clamav-unofficial-sigs/metadata.xml
deleted file mode 100644
index 828e566ffcab..000000000000
--- a/app-antivirus/clamav-unofficial-sigs/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mjo@gentoo.org</email>
-  </maintainer>
-    <use>
-      <flag name="cron">
-        Install an hourly cron job to /etc/cron.d that runs the
-        updates as the clamav user (instead of root), with an
-        appropriate home directory and shell. The same cron job
-        is installed as documentation when this flag is disabled.
-      </flag>
-    </use>
-  <upstream>
-    <remote-id type="sourceforge">unofficial-sigs</remote-id>
-    <remote-id type="github">extremeshok/clamav-unofficial-sigs</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 81fbff0d2ea5..8ee81c684bb9 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -14,6 +14,8 @@ AUX clamd_at.service 228 BLAKE2B 85181b02329a86495d0737308417dd873424da0bb1cd376
 AUX freshclamd.service 240 BLAKE2B 1b72ffee3b0b1b51811aa5f3c7a52678b3beb260f020dd326a437d6abf4bc515392d0b263eeb0773de128b9c0eff1c1f0b7b604dd14b9dffd50aba31909963e1 SHA512 28da28d633f487806448e17aec36648b6ba12f549549485704607e403e64643caea6ee9420e8101f11b3edebe62b651e6d6c338ab232f33b97b315d64b3789ac
 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
 DIST clamav-0.102.2.tar.gz 13227538 BLAKE2B 09d18f507a439f1dd63ebc038b129e0ead75bb344bfad2b5bd36e2c0c76af01f42fcacc60ff40b5676cb5fb7b38b90747452654a5d104b9b7b5e2d5a06b3dc2d SHA512 7db53e0e2b4d6b0e4cf5048d3c9dfbcabcffd680c3a2b718c763b9599b0c1c14e56bae70c54c251ee9e8fd1acd3134657196dbaad2d23a16bad76a088c6fc41f
+DIST clamav-0.102.3.tar.gz 13226108 BLAKE2B 741c0cc6a088ffe880eabb7a59151b3c13c5754f9cb36582ffca9cbeea6b039e3c49b7155ba14fa302e9ee4bfa6adf8b98f0e29f2354ea8569b11b1ed2b2532c SHA512 d239718814b303fb0f1655d9bdaf3675d888eea57e786d927eafabb7b6f58cd7f5fb7dc149511c2af6f800dcc919f2e1d6954110d45b9e16619c632e8d2b37f2
 EBUILD clamav-0.102.2-r1.ebuild 6672 BLAKE2B 3c1f209b0e8acec2707188ed1b3530bb0ecef2e0a655ae21501be78c9596fd9167b21755b4aaa50b63f0c3bbfecdb88768a089a445f461c49743283852ed4892 SHA512 8e627bbce15dbfbd16b8f34502dbf1dcb7bc7cf5a879361a42f1a47a7472a17017286c876e75d9dd5d9c7d2a7b06aee54f06cdded1c303a9892734a05d424c66
-EBUILD clamav-0.102.2-r2.ebuild 6650 BLAKE2B 5e156a5fc41192e30ae36d525879d545d6d48dd417871a626bf52595600462c1a1b27907ea787f0a882bea2f2609ab2cd223e8608c7312fd7404dda01b144d11 SHA512 0fc27a730a0a276a3b7cb84f6162eb3bf17561e80ca318d88215b51d518f7ef8f66ce9e04f30bc0ca17e33980086455166e4506da0e175f49f2043b288c5b9fe
+EBUILD clamav-0.102.2-r3.ebuild 7183 BLAKE2B b22974c7b3d75eb26e11286fb79251ec172316c08067d2da065610c1f41f1e4f77b0dc88e760de418284888788fe9a0007b4bb9944a1e375087d1c44538dc08b SHA512 117bac30e27e020b1c5ebbeb5c88a2df14477b766d290db2f10fdbd5e10485b8f11847c8187110a71ccebece6cf8d7f488ca093be7ca7acc413cca70c1bba739
+EBUILD clamav-0.102.3.ebuild 6650 BLAKE2B 5e156a5fc41192e30ae36d525879d545d6d48dd417871a626bf52595600462c1a1b27907ea787f0a882bea2f2609ab2cd223e8608c7312fd7404dda01b144d11 SHA512 0fc27a730a0a276a3b7cb84f6162eb3bf17561e80ca318d88215b51d518f7ef8f66ce9e04f30bc0ca17e33980086455166e4506da0e175f49f2043b288c5b9fe
 MISC metadata.xml 861 BLAKE2B fa97cb689d37536e3d128d2033038b1a6331ae3d8f435e39330506731c96f742b55f579ca02c678393c0af21fbab88189de8754d80b97fba35cf5a4f4eb2dd9a SHA512 5e2c58dfbb033270cfa014bc207d83799be06aaa02d1b490d6c202ffc151b54be72cd4e15380faffed2e3957c395e43b6853d1abfee99fa42de81159b7656a00
diff --git a/app-antivirus/clamav/clamav-0.102.2-r3.ebuild b/app-antivirus/clamav/clamav-0.102.2-r3.ebuild
new file mode 100644
index 000000000000..e4700595b032
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.102.2-r3.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux test uclibc xml"
+
+REQUIRED_USE="libclamav-only? ( !clamdtop !clamsubmit !milter !metadata-analysis-api )"
+
+RESTRICT="!test? ( test )"
+
+# Require acct-{user,group}/clamav at build time so that we can set
+# the permissions on /var/lib/clamav in src_install rather than in
+# pkg_postinst; calling "chown" on the live filesystem scares me.
+CDEPEND="acct-group/clamav
+	acct-user/clamav
+	dev-libs/libltdl
+	dev-libs/libmspack
+	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
+	>=sys-libs/zlib-1.2.2:=
+	bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses:0 )
+	clamsubmit? ( net-misc/curl dev-libs/json-c:= )
+	elibc_musl? ( sys-libs/fts-standalone )
+	iconv? ( virtual/libiconv )
+	!libclamav-only? ( net-misc/curl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	metadata-analysis-api? ( dev-libs/json-c:= )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	xml? ( dev-libs/libxml2 )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
+	"${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
+	"${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
+)
+
+src_prepare() {
+	default
+	eautoconf
+
+	if ! use clamsubmit; then
+		# ENABLE_CLAMSUBMIT is defined in the configure script based on
+		# only the values of $have_curl and $have_json (so we have no
+		# easy way to disable it). Here we hack the configure script to
+		# manually set the value of ENABLE_CLAMSUBMIT to something falsy
+		# when USE=clamsubmit is not set. Yes, this looks backwards. The
+		# value '#' is not a boolean indicator, it's a comment character.
+		sed -e "s/ENABLE_CLAMSUBMIT_TRUE=$/ENABLE_CLAMSUBMIT_TRUE='#'/" \
+			-e "s/ENABLE_CLAMSUBMIT_FALSE='#'/ENABLE_CLAMSUBMIT_FALSE=/" \
+			-i configure \
+			|| die 'failed to disable clamsubmit in ./configure script'
+	fi
+}
+
+src_configure() {
+	use elibc_musl && append-ldflags -lfts
+	use ppc64 && append-flags -mminimal-toc
+	use uclibc && export ac_cv_type_error_t=yes
+
+	# according to configure help it should be
+	# $(use_enable xml)
+	# but that does not work
+	# do not add this, since --disable-xml seems to override
+	# --without-xml
+	JSONCONF="--without-libjson"
+
+	if use clamsubmit || use metadata-analysis-api; then
+		# Either of these requires libjson-c.
+		JSONCONF="--with-libjson=${EPREFIX}/usr"
+	fi
+
+	local myeconfargs=(
+		$(use_enable bzip2)
+		$(use_enable clamdtop)
+		$(use_enable ipv6)
+		$(use_enable milter)
+		$(use_enable test check)
+		$(use_with xml)
+		$(use_with iconv)
+		${JSONCONF}
+		$(use_enable libclamav-only)
+		$(use_with !libclamav-only libcurl)
+		--with-system-libmspack
+		--cache-file="${S}"/config.cache
+		--disable-experimental
+		--disable-static
+		--disable-zlib-vcheck
+		--enable-id-check
+		--with-dbdir="${EPREFIX}"/var/lib/clamav
+		# Don't call --with-zlib=/usr (see bug #699296)
+		--with-zlib
+		--disable-llvm
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav || die
+
+	if ! use libclamav-only ; then
+		newinitd "${FILESDIR}"/clamd.initd-r6 clamd
+		newconfd "${FILESDIR}"/clamd.conf-r1 clamd
+
+		systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
+		systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
+		systemd_dounit "${FILESDIR}/clamd.service"
+		systemd_dounit "${FILESDIR}/freshclamd.service"
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/clamav.logrotate clamav
+
+		# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
+			-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
+			-e "s:.*\(User\) .*:\1 clamav:" \
+			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+			-e "s:^\#\(LogTime\).*:\1 yes:" \
+			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+			-e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
+			"${ED}"/etc/clamd.conf.sample || die
+
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
+			-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+			-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+			-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
+			-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+			-e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
+			"${ED}"/etc/freshclam.conf.sample || die
+
+		if use milter ; then
+			# MilterSocket one to include ' /' because there is a 2nd line for
+			# inet: which we want to leave
+			##dodoc "${FILESDIR}"/clamav-milter.README.gentoo
+			sed -i -e "s:^\(Example\):\# \1:" \
+				-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
+				-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
+				-e "s:.*\(User\) .*:\1 clamav:" \
+				-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
+				-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+				-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+				"${ED}"/etc/clamav-milter.conf.sample || die
+
+			cat >> "${ED}"/etc/conf.d/clamd <<-EOF
+				MILTER_NICELEVEL=19
+				START_MILTER=no
+			EOF
+
+			systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
+		fi
+
+		local i
+		for i in clamd freshclam clamav-milter
+		do
+			if [[ -f "${ED}"/etc/"${i}".conf.sample ]]; then
+				mv "${ED}"/etc/"${i}".conf{.sample,} || die
+			fi
+		done
+
+		# These both need to be writable by the clamav user.
+		# TODO: use syslog by default; that's what it's for.
+		diropts -o clamav -g clamav
+		keepdir /var/lib/clamav
+		keepdir /var/log/clamav
+	fi
+
+	if use doc ; then
+		local HTML_DOCS=( docs/html/. )
+		einstalldocs
+
+		if ! use libclamav-only ; then
+			doman docs/man/*.[1-8]
+		fi
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	if use libclamav-only ; then
+		ewarn "Test target not available when USE=libclamav-only is set, skipping tests ..."
+		return 0
+	fi
+
+	emake quick-check
+}
+
+pkg_postinst() {
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+
+	local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d )
+	if [[ ! -f "${databases}" ]] ; then
+		ewarn "You must run freshclam manually to populate the virus database"
+		ewarn "before starting clamav for the first time."
+	fi
+
+	elog "For instructions on how to use clamonacc, see"
+	elog
+	elog "  https://www.clamav.net/documents/on-access-scanning"
+}
diff --git a/app-antivirus/clamav/clamav-0.102.2-r2.ebuild b/app-antivirus/clamav/clamav-0.102.3.ebuild
index 35a1db0325cf..35a1db0325cf 100644
--- a/app-antivirus/clamav/clamav-0.102.2-r2.ebuild
+++ b/app-antivirus/clamav/clamav-0.102.3.ebuild
diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest
index 6c0ad8bbf7e7..489aef502f71 100644
--- a/app-antivirus/clamtk/Manifest
+++ b/app-antivirus/clamtk/Manifest
@@ -1,8 +1,10 @@
 AUX clamtk-6.00-change_icon_path.patch 786 BLAKE2B 05a5e30bf33e4d13134d08277bac3011559c86d6a14d681dbf4217d62addb23345ded4e6e9c30bba1a5175a9a185150b1cf8d7d2773d49a33c6ef5117ab1647c SHA512 29871b25a948d182a613b5d12d60fc34e48ca473edae27763b51cc1403b7dbda56b4bfcf91bdfd04f0165f893010be8f0bf9975f74b8465239c7833cfd861932
 DIST clamtk-6.02.tar.xz 227780 BLAKE2B cd5f05c5d5fe2fe7e6d52ab4619fe01f810195ca505ae85101e0cf743d9d20e42de74dfadfaecdc23cb97359121ea8ddc49772a96ec237921a7d6628ae453cc4 SHA512 df619da28ebadb218bb2f9ab2c9be1804f2df5e7e444762f2b1eb3ce0e830b07ebfd05b8cb9c7d79a9e3523c9837b00b52d0e06265c62d782487546f15b0349f
+DIST clamtk-6.03.tar.xz 227940 BLAKE2B 08364ba8c3b4fcdb49364cd2721413c7f487aaff23dfa0fb0e7b28f9baf9d267589099cc159558dd004fe882d762b6ece272672aab962b4a666fb8c244671d19 SHA512 4e81b161b17ae15a307d026766efcab2ea0433437e68dd7e3465e07c999e66c556372adc29cee093a1cec5a8f37861d1b8cddd08ed6e4cfbd59f5333d4f03fac
 DIST clamtk-gnome-0.03.tar.xz 15088 BLAKE2B cc1440de117eea036cf14a9ed36650916703299799c90548b02a5fee92c80f82c1d4f63e1cd726438e428e1ae3ee1550b4c8acbc22e97093131f993099c47c36 SHA512 c35a3ee34cbe5609f2ad22d0974a503bf6f24710c26d71d865c3ad3751a72fe909a9773c27cc53295c581f77d33e58d49fdd6f38f71177aa7ef1570e00ea55f2
 DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee73581c5d1d400c1b28908c5ea2524a8f5d1110b1e949038378613fb4d5607d5123eebe91df695a53d0dd489302 SHA512 145ddd349010e0bb6fe3295e50d6e15a2dd96e604babbd5de4cb49ba75169d2050777cac38e40ac6a64cb89ddf94025d610aca73136c75f81115d0a2d863d24e
 DIST nemo-sendto-clamtk-0.04.tar.xz 4228 BLAKE2B ce656d4f021bc30cd12fb2ee5f98a78c1f1fdb2460ed2cbba0b572408617f91b39b2ca2fe542b9cec7be79b4b9fdfd685f5553e1a671454ca1e6723241dcb805 SHA512 2b5d3abbc4ae5dbc71b1b7bc836df88ad51e6afa00d5e954b5c1355a70c0420b6fef895e1cb5cccb86a662aee2039cef6c01821c1347fa155b5da3529b25562c
 DIST thunar-sendto-clamtk-0.06.tar.xz 4416 BLAKE2B 6b9f8857fead9f175af0a5fd3585790c49865b07016ddbc0dfc21f761ecbac32d97a65731fdca0335fd4852af9efc93c06ecb994f769a5efeade35cb734e9924 SHA512 f3b6f296213ad5974f8134d682cce4e426d9730d1898e8f7ea474e27314ee47957b033bbd7f16196cabf054eccec844c05ff8c8f9a98ad013a7f89b899cee591
 EBUILD clamtk-6.02-r1.ebuild 3889 BLAKE2B d3481bab34a0f27e0a5a6255e6f1744a5d38bfcfce57d0e493512f043fcc4ab44f446a67d33f5047612dbe6f9f6fba3000a63e5e0de810b5ab090efa2d3ebd96 SHA512 c4e6954978e84643c27457cc111df23ae3c1d2729a1caa9fc36406b4eaf2df70aa09ebe29d2dd1742047b2959e4f98940a984f4ec292dcea4a930e032867892f
+EBUILD clamtk-6.03.ebuild 3800 BLAKE2B 0facdff2ee818adeb256b3d4fd4c5a2d4f00264e5f479b1653cccc2a53d33b1d4e3a6bf6dcdc600825a0d3c69cdba77d05053ea836a4303e3c13cf6d27620cb9 SHA512 ed9f24cfa5f03aeef27123e576f47133b8fce38605a9e6561349fdd4cd7a1912dc0feb13c4a2afd7fafc65e1d657a9f7adf661cb45871350e3dbfb85d7ed18de
 MISC metadata.xml 809 BLAKE2B 6c61c6d564fd120a1996f0620eb94af868a19a4a2178ebf694bda8f7a926b42848723911d2b45ed6a8199a969802d62e574422d22a76163fea2eb8d053553236 SHA512 984613fcdc7d6c2dd02475f3a9ca0f1e68e66c59961d9e43532722b5ac4c8022a4daff30742eec959da5317d4f3e10c2608538b50bad5b4d95af5ba7731f75b7
diff --git a/app-antivirus/clamtk/clamtk-6.03.ebuild b/app-antivirus/clamtk/clamtk-6.03.ebuild
new file mode 100644
index 000000000000..bb4940ea38be
--- /dev/null
+++ b/app-antivirus/clamtk/clamtk-6.03.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop perl-functions python-single-r1 xdg-utils
+
+MY_PV_KDE="0.18"
+MY_PV_NAUTILUS="0.03"
+MY_PV_NEMO="0.04"
+MY_PV_THUNAR="0.06"
+
+DESCRIPTION="A graphical front-end for ClamAV"
+HOMEPAGE="https://gitlab.com/dave_m/clamtk/wikis/Home"
+SRC_URI="
+	https://bitbucket.org/davem_/${PN}-gtk3/downloads/${P}.tar.xz
+	kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz )
+	nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz )
+	nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz )
+	thunar? ( https://bitbucket.org/davem_/thunar-sendto-${PN}/downloads/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz )
+"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde nautilus nemo +nls thunar"
+REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-antivirus/clamav
+	dev-perl/File-chdir
+	dev-perl/Gtk3
+	dev-perl/JSON
+	dev-perl/LWP-Protocol-https
+	dev-perl/LWP-UserAgent-Cached
+	dev-perl/Locale-gettext
+	dev-perl/Text-CSV
+	dev-perl/glib-perl
+	dev-perl/libwww-perl
+	virtual/perl-Digest-MD5
+	virtual/perl-Digest-SHA
+	virtual/perl-Encode
+	virtual/perl-MIME-Base64
+	virtual/perl-Time-Piece
+	nautilus? (
+		${PYTHON_DEPS}
+		dev-python/nautilus-python[${PYTHON_SINGLE_USEDEP}]
+	)
+"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" )
+
+pkg_setup() {
+	use nautilus && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	unpack "${S}"/clamtk.1.gz
+
+	use kde && unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
+	use nautilus && unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
+	use nemo && unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
+	use thunar && unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
+}
+
+src_install() {
+	dobin clamtk
+
+	perl_set_version
+	insinto "${VENDOR_LIB}"/ClamTk
+	doins lib/*.pm
+
+	use nls && domo po/*.mo
+
+	doicon images/clamtk.png images/clamtk.xpm
+
+	domenu clamtk.desktop
+
+	doman ../clamtk.1
+
+	if use kde; then
+		insinto /usr/share/kservices5/ServiceMenus
+		doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop
+
+		doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm
+
+		doman ../clamtk-kde.1
+
+		docinto dolphin
+		dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md
+	fi
+
+	if use nautilus; then
+		insinto /usr/share/nautilus-python/extensions
+		doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py
+
+		doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png
+
+		doman ../clamtk-gnome.1
+
+		docinto nautilus
+		dodoc ../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES ../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER ../clamtk-gnome-${MY_PV_NAUTILUS}/README.md
+	fi
+
+	if use nemo; then
+		insinto /usr/share/nemo/actions/
+		doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action
+
+		doman ../nemo-sendto-clamtk.1
+
+		docinto nemo
+		dodoc ../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES ../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER ../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md
+	fi
+
+	if use thunar; then
+		insinto /usr/share/Thunar/sendto
+		doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop
+
+		doman ../thunar-sendto-clamtk.1
+
+		docinto thunar
+		dodoc ../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES ../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER ../thunar-sendto-clamtk-${MY_PV_THUNAR}/README
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}