version bump - fixes bug #529728

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

4 files changed, 152 insertions, 23 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index a9371f58f93f..7ff9b15153fd 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.490 2014/11/02 09:01:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.491 2014/11/27 09:30:40 lordvan Exp $
+
+*clamav-0.98.5 (27 Nov 2014)
+
+  27 Nov 2014; Thomas Raschbacher <lordvan@gentoo.org> +clamav-0.98.5.ebuild,
+  metadata.xml:
+  version bump + local use flag for new feature.
+  Fixes bug #529728
 
   02 Nov 2014; Agostino Sarubbo <ago@gentoo.org> clamav-0.98.4.ebuild:
   Stable for alpha, wrt bug #521478
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index ed524cf1a77f..d68f03b82e26 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX clamav-milter.README.gentoo 1124 SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11 SHA512 1c6160e48eddd28f83ec5f24757f788781cef55789d1934dfccc12c7c5e5635a226d26b0983cab7344c142f5a2f1db172640b1d0e6c840a6fa83abed9be1211a WHIRLPOOL f85b17448fd93205e2f38d024b96410cc8d143d077201e0a1b8f4cda95ae2447a70eded4cb90968a593ad2637229300fa04bfe5dba96d3d68c2d09c105ee3f16
 AUX clamav-milter.service 284 SHA256 b371725acfd102b6b7ee15ab0059e8795b7d3716d041d0dc11d0fe8f7454d5a9 SHA512 442148ac3c42ecbb893de5c6edde337b72a745d20f6c5ffa33131f9a0b2daadcffac39b686ada986a5ab500ea7b9153c448abc1b819e15fef488da1812bb0cee WHIRLPOOL 56b4ed79e06c764df37022f0638ceddb5fe8185c54b2e460b076a46ed4f5a68b67fb7966d424dabe836bfd7d6b9d770eb60cad4633ee17083baa50ad2c0a89cd
 AUX clamav-milter.service-r1 303 SHA256 c1e553156c14bfb007df467c13be0b3885ea79b4777711b6417fac5371461d90 SHA512 5dc30e3c57d9bff6595155e8299336c579c713aed429ab770f10d7678dd74691a135aa2070a825ddb726fdabcb001c19caeb993c1cd9a6fcf95d1d47f7160540 WHIRLPOOL d2cb6e8caa83845d2f9ca7ffd7f2d0382a633a34463599515d46dcfde87fadfffdeed62f4763b5f519268bd03b99c49c19c3196359eab06062866ca38f96d680
@@ -17,28 +14,13 @@ AUX tmpfiles.d/clamav.conf 33 SHA256 893bda174539a1a2ffc7f713f563d172593d9707da5
 DIST clamav-0.98.1.tar.gz 15431484 SHA256 35f5e84d734cdd4532c1cc6c92560c5b31d1c24f2e1e203bef0ca1351eb223dc SHA512 5daac24d346a03acc7e4d8f9e5962a009a908326663008557cbc2af4426e6059cbebbb8fac6d718edf9a567075b823c457f3f9a3aea3c558f5ee272274030b42 WHIRLPOOL 0af4baeefb5e384db0679bdbad2902ced213adb4993c61755fb4065845106779b3467e61dd6fc38b4d7fcecf492069e2a02178a259c618fd6e2f309faf9d1eb1
 DIST clamav-0.98.3.tar.gz 15543335 SHA256 2792a9e8706a516d2e81339846fc38f94fa8dd3f604b2fde9d0b07593727f62b SHA512 5b3fadfeb3446ecdb47281d196a46709365f573abf3b459b875eacea55d788d03875817a2f2d48a064647187a6c6d6df1e67a9fe39bda8c1f53e81b897d3c7b9 WHIRLPOOL 095c433bc6a91ab5efdafa72b66e37c713570ca0495f97f04c393676ebd8aad146cdc5d305e7321fff505ebe5e97a9ffb0a67f5b56d276a74b8f109095e6b0a3
 DIST clamav-0.98.4.tar.gz 15537593 SHA256 d3006747abcf750f395a8bfa8267ab314c7b63196c4b41e7717948aaaafa3e1c SHA512 f928db33c7e4258ddd2ede86b7b998547dc6beee0f886a9f567aa89734bc62526a4f5fb60646cddb1c13d35837b8c04f98a74d57c8d348ca90a4fe8a4af261d8 WHIRLPOOL f15adc30018418a7468b8c6548d4d2add61936ec19317af653e5f5debb6491518236a74b2aa0e119c119b1e74e6f8cfdff5a6c21a4b0e6c7608fe1e42206cf0e
+DIST clamav-0.98.5.tar.gz 15146379 SHA256 9c2f37d5fa9033936468237f6f4b29289f30791caa84765ef510acb56c8daa4d SHA512 4fd3af9e8e828b426ac4aaa867b356df05eb84396b62ab02715630683371f5a9b7a417d495236952a5e112b700ec0304c3760351855d10edc9fa8c032a64c52c WHIRLPOOL d7d32199c9fed92a6a7dd827f7ddac9b6a9689f29d315a7f525d8cf9e96bcf37087b743cc0b181d7e76f6f47897ac93f587de9f9ed336bd7a7552a320608332a
 DIST clamav-0.98.tar.gz 37075245 SHA256 113450537f46ed47f010a179be333a0dcd79eac13f264dce26db7aac8d52b3b6 SHA512 532f9fa2616065879b3ecace2672fad26cf3863943e0ecb8835fbed7e5907600ef50b8df820a08a6586bf77c9bf7c6e50af671f31b7c3ee372c31745a173099f WHIRLPOOL a4ee9efd09193aee7fd740dbb60acabdd4a1f6d5171a4e0fa220441457e3431bf99b27c7300ca0e3e124bb5406f65acf106fa51bfc34d87335ca83ccbc942979
 EBUILD clamav-0.98.1-r1.ebuild 4481 SHA256 5b62b63b419276744242e59426254c392e8a565d7355954e395e9b11fe1832b5 SHA512 3768525cf0f27a6a620f397b816b6bc4987ca3154f6124d059081c337e374de8641f73ca7bf22ad647659f780a167f339f41075756c11e85d0f5d431993bf4ef WHIRLPOOL 2ec9a469e42127a9b09ca12af1da3be4497f40d38c2092e1e13918e43ef098acb0a9cc2b2097fea1fee205afb8dd92c87854d1bb03fd29fec18a96cf4cbd642b
 EBUILD clamav-0.98.1.ebuild 4442 SHA256 d76ef5222e83b0cb6b4eb5bb09378df70073a044a34923b57875ed781d7fe604 SHA512 a5f20b6046d704946a562cbcdefa88a3c22806412e623872007d036148c1776d613ad63f9ce0dd755f135002002aa5190eca2be06aa1304fc771cfd19d0d810b WHIRLPOOL 0551a085d169c31b1aa7e72e3f577309f55876382d07f8db9f62ae0da9b02dc883238c43fa1be5dd8ce2172e2b5fbe9df44b5f2a056c5f275636a57fa995e469
 EBUILD clamav-0.98.3.ebuild 4640 SHA256 a886d799eba1933ece35982ae129f9d83bc3ec9487e9a0ff0968d3644f83f01a SHA512 362260ee7eafb2d6578dede70c921d4b291e76625a46a47b5bb116857506a626cd47d0b0250efccd89abdac2a54521632043ad40f2bb3fc897aeffc5011d37ff WHIRLPOOL f1030d10b71146bbcbb7befd4d881288fa90b674a3fec008420c69bb206ece69dd0c89362bccf1378942cbcaa6677b3971ee27a9ae0b7219405fc0ecd9a9982c
 EBUILD clamav-0.98.4.ebuild 4628 SHA256 3e554e5112733d162f72f89f1738fb52c26a9236afea921981d8054db9e4fdd9 SHA512 a467b599d4277877e0096ba179c25fc086280467d4c8e490d6a85a7a9ba25cf2acb39ddd8a474ab5570b53145c25c1087ee663387bcc10683d2f11aca6b3ace4 WHIRLPOOL 72a145ff6594958640e59625cba4fcddae9e806be11bf780a7335d1290820a4c7df69ca20349fe86ef85e3465de15583282836aac9948d71a6664b472d2f6f2a
+EBUILD clamav-0.98.5.ebuild 4757 SHA256 25d34a8ba5a27ad3b39fc44d5dbad842aba9d8efdd280094829153923471ba4e SHA512 70df11d2c89a666514d7ba9f98a235c3578015e41aef3b923d14c271f266a58ddca3cc7ad3bf789b719ad9ee79e3c64047e61cec34697aaa198c1d91c9078907 WHIRLPOOL 9b5e87c94f56d26355d2be415ad07f19b07fb07b7249f7b9e1b771cc745d47a32a734878bc502370acde64d021f8fd20af061a01518ca045caa4558513b78cb2
 EBUILD clamav-0.98.ebuild 4445 SHA256 36f1955fd140dd06cd88cccc79029b5bb5a121fa85002a6f13500f43bf7c784a SHA512 90f28877771019c3a26840184b269a20a5f22519c2e77be2b49d7647e4402634fed7e273ea38f846300171c59f60c5b6b0b5daf1d4c6bf90f8d8ee20b1714a0e WHIRLPOOL 22fcd5cad02c1ff599ea686662a78deca82bd88712418b3e6897e7206f7c12c8595ddd767afe4bc141607d0601f35f1c2d3cd9b71f00ea351107b8afd16f96bb
-MISC ChangeLog 71074 SHA256 5cef6e3bc8f2789f95fc33648c1c28ff039f26a78d5928c7771c5edd01d3a0bb SHA512 7195af9b12f60810e3b8d36891149afe9670e29c1545819d547015afbe990fa279d5616d17283c6d4e7733585eecf0f71481fa74403860b17be28d0afcc0a92c WHIRLPOOL 74ac7ba4ef11e526b764467dfde465a22ec0c346ac8a8826865cb473bc2713d914440662bbbf2a2151ca276d8548541bf2cfa942d001dd3a5717bc0a03fea758
-MISC metadata.xml 320 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d SHA512 c5bb20c993b91112d9c9e0b7bb6c116ac7f711c769084eaaacc28bc7eeb54db09c9794c6ef057747d80a08cf1502f0f688cdefc741423a38da55b2deaebd6476 WHIRLPOOL 741ff80258dee2c145d08f72f10982bd5c1fcba44ed84054cd1a33787864a7d8821b432c3246ad5a04ce11edde7d045f3eb6e056200e3bd2e8505eeea3d7277d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUVfL8AAoJELp701BxlEWfnloP+wZzE37MZv9d1nlyx4SI8Bgp
-vvfGM8P1atchq3F5CXa9EMcrm6Zsb9s+kPa5MLllq9QMMSiXb5jXlASzZ2E1yPOH
-1UtSTXJ5zUnibOhB6BiaCthCoQKoA7dqOazdeQ/0A/fGEkjs/xvYtfc6uX+aMrLp
-MrFVGHAqjHnwMQrS4P7vGhV/80CwQwesAdQzgmlNeN3hYlZUnEVdXd0VUF9l7bNy
-VOIsvCNz+Kc4xLr+dNqzXSKf07zWYXl7rPSLls0dAyGFTzl8Em5SB0mwXVJb5YNi
-i1dgcgcGEMKzmd26cKVc8roYBIGNyancXbZ+3ePc0DZYMGudc9vPFLP9rr8GWMmD
-r4ebPZg4Wuc7tttEWZm4Bm+A+hl2nUHn3gJ9zNZBNkAfUPwkg8eNxZQ5atYj9o7T
-grnmXPUWkKVik7rN6zLnXEAWmgGrXH9wiQSq3Aw2Dphh/6zNUwd3Otxa/ymGs8xL
-28kk0lzM8FZlUR8ekqo1MFM3FP7jCCcXy0+DoB9jUFzm++f9Qtnv3fmh8QPSwVHQ
-p37LdTwIqBZ/7zBFIniNo76jwraf3QfBi+erywmfnI5ik9JPgYoJqWWKRhJyZSvL
-RbBl0SYKvNxk1zUgxQ/7bhHIKmg0lTcEehm2NkZESY4zbEpMiIjer0M15zIWBO+Y
-Kcb556VAWBmQnaK3V1BH
-=OZ/9
------END PGP SIGNATURE-----
+MISC ChangeLog 71272 SHA256 d7befb8f420a7f336680f60be3842390ceb5170fe9c2d4ff89c3fd44f153b91a SHA512 8414a3f178d80741edcd9167d8a52486b13cf1d14e38ad547d028c4f9b948a08c4def195fd86c036680aca7f0d39f4a1ac415527dc29c4bb8cd0bc89cc7c6196 WHIRLPOOL 2429e5209c3619adec4c98e911993f609e246714d814d117d7e9dbc1ed4594c98fb7d9f48610487cd986096cf7b61c56f40952be9460d054d79dcd90f6190b6c
+MISC metadata.xml 470 SHA256 8af400c1b8f6338bb61bbd3040c947cc0d2592e764109267e529682fe865db1f SHA512 4c29af4978a5a0fd84a81c0402189c569a8aff3e111a5d03be1b5296125292b2f0f0c9cf377593b6e80b6ac21ebe05cff7840c6116e6612571e5d40296cb0342 WHIRLPOOL 5d42dbf37cec46035a3a27a5b696e22f8794bb200d0958e0501bc80db5d2844bdff658b3a0ef543278f64506658acb9805a67e1ccff068c0d310e04795b1dd9f
diff --git a/app-antivirus/clamav/clamav-0.98.5.ebuild b/app-antivirus/clamav/clamav-0.98.5.ebuild
new file mode 100644
index 000000000000..df26b7cfbbfb
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.98.5.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.98.5.ebuild,v 1.1 2014/11/27 09:30:40 lordvan Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic user systemd
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="http://www.clamav.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 clamdtop iconv ipv6 milter metadata-analysis-api selinux static-libs uclibc"
+
+CDEPEND="bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses )
+	iconv? ( virtual/libiconv )
+	metadata-analysis-api? ( dev-libs/json-c )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	dev-libs/libtommath
+	>=sys-libs/zlib-1.2.2
+	dev-libs/openssl
+	sys-devel/libtool"
+# openssl is now *required* see this link as to why
+# http://www.clamav.net/lang/en/2014/02/22/introducing-openssl-as-a-dependency-to-clamav/
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+	use ppc64 && append-flags -mminimal-toc
+	use uclibc && export ac_cv_type_error_t=yes
+}
+
+src_configure() {
+	econf \
+		--disable-experimental \
+		--disable-fanotify \
+		--enable-id-check \
+		--with-dbdir="${EPREFIX}"/var/lib/clamav \
+		--with-system-tommath \
+		--with-zlib="${EPREFIX}"/usr \
+		$(use_enable bzip2) \
+		$(use_enable clamdtop) \
+		$(use_enable ipv6) \
+		$(use_enable milter) \
+		$(use_enable static-libs static) \
+		$(use_with iconv) \
+		$(use_with metadata-analysis-api libjson /usr)
+}
+
+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
+
+	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
+}
+
+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
+}
diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
index e2cc2031a88f..cc89685917a6 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -5,5 +5,6 @@
   <herd>antivirus</herd>
   <use>
     <flag name="clamdtop">A Top like tool which shows what clamd is currently scanning amongst other things</flag>
+    <flag name="metadata-analysis-api">Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.</flag>
   </use>
 </pkgmetadata>