gentoo resync : 03.03.2019

3 files changed, 180 insertions, 3 deletions

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 318f384cbbc0..c0c5012f9db4 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -16,12 +16,14 @@ DIST clamav-0.100.0.tar.gz 16036757 BLAKE2B c51edfb05726e16e2ff1ef1fee9f174af5a0
 DIST clamav-0.100.1.tar.gz 16154415 BLAKE2B df4ddde28b0b263765f4a571a407390b30aa6fe58d07e1b8fe427e70141219fb3d7c5addfbf30a350c6c08324dee1ec3dd80319306df7578ed87138c6513b99d SHA512 13a4e050e030ac3d1cc07b12bdd56c455e266e0b205a4c9bc9f18e53f6d8913a66eed2296abf857f395227ab0ed5c7bc90bc357bcb314dc9e18a9c6177dcc5b2
 DIST clamav-0.100.2.tar.gz 15926420 BLAKE2B 0a64a08b6cdad94f55852041df06b5517bcfa3bacb5871c694bf51692c4698ffd39f09c92fe2af167fcf2b27806a7175a9b649e6d6d5ffc65755509e3574d374 SHA512 70b51eafb11dc727188e7d4554b8095a9e0406e76b78778fede94f8a4c78146034478197217039384eb1fd15532e822cfa6b51707e431e9397ec21d5e393a60c
 DIST clamav-0.101.0.tar.gz 21686531 BLAKE2B ea3ae1e5b31d6b10600eac8f0ea93c9460f0e337de7a3f43345c26e0efb0b3f664d1f640b723795eac6491f959492202a249222b561917072811df86314ea9d8 SHA512 faf6186b51b332eca67684bfe72f473a910577093964338278656ab67c61d28f66f7f501f4db5e1bb37112d66ad4433d792c50af70aceefd5bcbc5dab7ac7aa0
+DIST clamav-0.101.1.tar.gz 21691396 BLAKE2B e9a63ba90bef5504aac1020293f26cf957323677ed229543f0e7784b80e11837683e72432890f3109b040a2ba08029383892a6f40f64050d3caa3fe94c0571aa SHA512 eb72fe21a9485d2906aec7f9a3dc955bbe4bb0fa812d622bc9c6c5c019eb2238a7370cb5dc1ba3886764269a925f7dcbe93255c77920bb489af4f3f81680d4c8
 DIST clamav-0.99.4.tar.gz 16083015 BLAKE2B 3c2e7d11ee05fe846f75c3fb6501b5fd809a2e58f8e69c82e493e32fcbc87ca0e5b5f7ab83a0d7e251a5dc8e84aed1475c87c1248b393fa04b6924a2ab32b9bf SHA512 778d5ef510d8d4bdfac5dc33d92469ed4283c414b3d42da6e1a0b13ed70e37755d5c837622dc336bc728ba1f8bf5485fc8a8d3a67a90e9aaa9e4dc71ece0691d
 EBUILD clamav-0.100.0.ebuild 5258 BLAKE2B 79c3b2fa7d2acd9288785ecec5761132bd3b1fe9219513d59133dc0877d2802e1b57927a686dc55bc397e66fdc79c943d629e512dda99ded6f995139e9cc450e SHA512 2b1fde01326f798c7e52494090eef039400fec3d225d932b0a004728926a3d57559bb2ea0beb7584c624b037d5d3f14861408ec073f6be9a52bec77353ad50fd
 EBUILD clamav-0.100.1-r1.ebuild 5337 BLAKE2B 16b5beb72422f5399c76f96d6a0b5427d21e91929615818950769227296939016924692f89cf32ea9bd799a21a589dad2a2d3a68197d42a2b1fb80f59ce77b41 SHA512 ae405b7ecae1293f242ef120cb90476f698c07588c17b663f94cd10366eb23314a5b7a47c6fb912abf06d5da511bda8b218715a2aa223a9555c5d7d6651401e7
 EBUILD clamav-0.100.1.ebuild 5263 BLAKE2B 48e800ac532b6d6f42d6e1d5766d4cb9fa33e3c9452fc5b5df0e72a5287c7124aefaaad0164b8863f85a58461aab0a3222bd5983731c828a8e3f2b73eb2ce990 SHA512 51c138ff3680b89770830f891fec9ae3bb69a169501cd550d23b8d954eb0d4a7273ddc671dac789544637a3a6c785a54572ad8922d6c9598a4f69b6479c72315
 EBUILD clamav-0.100.2.ebuild 5517 BLAKE2B 9de363bf86a77e276d2c150079354a49f7b184e4782279920af51adccbf64b44d310c4fb1396c084472a54df2149fe3d2c480ca512f628e1175225bf3025793b SHA512 d765955e0787f037710597de836ccea9f19b3987bd8cb308d007fbb0b2500101225852d81c01ed43a98eb1e17ca759fdde85fa32b93b5e3bd72ce137052d3875
-EBUILD clamav-0.101.0.ebuild 5498 BLAKE2B 3fa01fac56ec3da3172b46650c118508e02f7277c0164807b6716c227e4fcfc793fe85f7c52a7bb09516e1c3966f36c9b9516c73ef0c6b0ff5c53cf466e66cf8 SHA512 675d6bb97fd26bfa54fcc53fd30d045cbce4fad97edea5318c3c91df0f26a41a6f3632bd22d0e077e20655846443b090d317147a101cf40928d3c46cc91d9941
+EBUILD clamav-0.101.0.ebuild 5494 BLAKE2B d0746cb7029f7be1d0fbe3e1b3b7b370177594f6ef8e22ba15092c6e42a68e0ec876b5c9109de43ff9fed940205e8ce1ef25d7526a265b355f78681d369892d8 SHA512 28ea470e81f65c4a7fcdd0e3f943121cb5b6bb8c82bcfe2cd6305cd266541c70948d411e17df7bd92a06ee1f53ac1e54702fd2f230e371c5f4028ce0e7559e7d
+EBUILD clamav-0.101.1.ebuild 5498 BLAKE2B 8f410d5caf1f6caa3c2bab34d8dc09abb6dc134e386ade36776b7680feea489c07bb1efa98bf4b5f3eed17178587c19c590777e557e35a01d2f06fb9e337e144 SHA512 b36238c4e6875952ec7dbd87cced6ed448e8317aff438e3a054e5a0fb4733cb69951553a2f54930ba4cf8025be3fdfbf096ee5109b38c8d23d854464158a8618
 EBUILD clamav-0.99.4-r1.ebuild 5117 BLAKE2B 1af1ba195eec3e7c9154386101719e08d7e0f2a28f74871374195b9619cdd99b5306d203eec88fe1041f5f024ec9baadfd02ed1f269dcf806dd6b3341ac1fd59 SHA512 f211a3bcb516f86a2d2143aea40e61e0c4e54064dfd7e37f1130ae38323efbd70c4d93eec321669ec7274b1eaadd2acf16dc9ad41bb290b4a1136b16e505dd8e
 EBUILD clamav-0.99.4-r2.ebuild 5117 BLAKE2B 1af1ba195eec3e7c9154386101719e08d7e0f2a28f74871374195b9619cdd99b5306d203eec88fe1041f5f024ec9baadfd02ed1f269dcf806dd6b3341ac1fd59 SHA512 f211a3bcb516f86a2d2143aea40e61e0c4e54064dfd7e37f1130ae38323efbd70c4d93eec321669ec7274b1eaadd2acf16dc9ad41bb290b4a1136b16e505dd8e
 MISC metadata.xml 870 BLAKE2B 8cf11482134a16789726d801ea4562fd31cad0c107e2deeab8d0442d9f868a48445ac99245926278d781eee9d2883effeab2f4b3d036442e8f0876b47680f51b SHA512 6791e9ef08015b4ff640beae21b61c609f5e4c942b87acbd8eb2c67e7686729e1752affb7d6cd19233878d9608fe04f52367d7247ba92496e89abf561007e855
diff --git a/app-antivirus/clamav/clamav-0.101.0.ebuild b/app-antivirus/clamav/clamav-0.101.0.ebuild
index 5f65942960da..171b056c98ae 100644
--- a/app-antivirus/clamav/clamav-0.101.0.ebuild
+++ b/app-antivirus/clamav/clamav-0.101.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-antivirus/clamav/clamav-0.101.1.ebuild b/app-antivirus/clamav/clamav-0.101.1.ebuild
new file mode 100644
index 000000000000..63e3af208b0a
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.101.1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic user 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="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
+
+CDEPEND="bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses:0 )
+	iconv? ( virtual/libiconv )
+	metadata-analysis-api? ( dev-libs/json-c:= )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	>=sys-libs/zlib-1.2.2:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-devel/libtool
+	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
+	dev-libs/libmspack
+	xml? ( dev-libs/libxml2 )
+	elibc_musl? ( sys-libs/fts-standalone )
+	!!<app-antivirus/clamav-0.99"
+# hard block clamav < 0.99 due to linking problems Bug #567680
+# openssl is now *required* see this link as to why
+# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+DOCS=( docs/UserManual.md docs/UserManual )
+HTML_DOCS=( docs/html )
+
+#PATCHES=(
+#	"${FILESDIR}/clamav-0.100.0_autotools.patch"
+#)
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+#src_prepare() {
+#	default
+#
+#	eautoconf
+#}
+
+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 
+
+	econf \
+		$(use_enable bzip2) \
+		$(use_enable clamdtop) \
+		$(use_enable ipv6) \
+		$(use_enable milter) \
+		$(use_enable static-libs static) \
+		$(use_enable test check) \
+		$(use_with xml) \
+		$(use_with iconv) \
+		$(use_with metadata-analysis-api libjson /usr) \
+		--with-system-libmspack \
+		--cache-file="${S}"/config.cache \
+		--disable-experimental \
+		--disable-gcc-vcheck \
+		--disable-zlib-vcheck \
+		--enable-id-check \
+		--with-dbdir="${EPREFIX}"/var/lib/clamav \
+		--with-zlib="${EPREFIX}"/usr \
+		--disable-llvm
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav
+	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"
+
+	keepdir /var/lib/clamav
+	fowners clamav:clamav /var/lib/clamav
+	keepdir /var/log/clamav
+	fowners clamav:clamav /var/log/clamav
+
+	dodir /etc/logrotate.d
+	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:" \
+		"${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:" \
+		"${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
+
+	if use doc; then
+	   einstalldocs
+	   doman docs/man/*.[1-8]
+	fi
+
+	for i in clamd freshclam clamav-milter
+	do
+		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
+	done
+
+	prune_libtool_files --all
+}
+
+src_test() {
+	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
+	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
+		ewarn "You must run freshclam manually to populate the virus database files"
+		ewarn "before starting clamav for the first time.\n"
+	fi
+}