Add app-antivirus/clamav-0.99.2-r1

5 files changed, 273 insertions, 3 deletions

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 723345f0..03b37a2b 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,6 +1,8 @@
 AUX clamav-0.97-nls.patch 269 SHA256 088b9edcdb678ce9c072042cf51266e061ab5f5ab0e8e42bd953242138c64fd1 SHA512 a0508590353c699d62d203398e4b84ea134348567fa5530e5c9c7ce850a9eeca106544e641ce011cc0a5097313dea780490e7db6fdda1ec2ab61dd6474e31458 WHIRLPOOL 95ce0a012bbb8d0cde2c255d7f15ab8eb24d412cd7b664ce2e7dc6ea887c608252076e45f7f4a007edda455f07b62884002a6d914b25b889da2682140d31f20c
-AUX clamav-0.98.4-x32.patch 1124 SHA256 0d7e719944f493112720627f290718079d549c79021ae9017046a46ea4339bf6 SHA512 211ab31fcc551563f6bf1c2371734b96b22e19e2cd2dafdef389242e308776dcf2394c99325c7cd7791a996f3240a11497883136f1245605a8efa1957c06b795 WHIRLPOOL 7cd49fa51d6c5fbf79e8f1dd956ab9a0e87e696a2dcb613eebf0f8e4f93eaf81e5fb4ff2f51708b78c0d45dd3b457de32d84bfeffca36d089779f3910122aa4b
+AUX clamav-0.98.4-x32.patch 1128 SHA256 243007986f747ae29dc566b3e4e11042078ccb54c81f8cb8a3ac59371b131eac SHA512 205069884b28bbcb9d9dbdadba355159f7fb46b727db8ac7168d015230817008d935452f5ab4a1969e9e429aee97c0532dba00cdf585d340ad1599793b814731 WHIRLPOOL fbf7727002572ac781d54a7f4f506820a2c5b83c2412ca53c72028b89b3b070b6dc4dd79b254742aa129a9944e908b98bb3901c8a72204778dd38906d07e79e0
 AUX clamav-0.99-zlib.patch 805 SHA256 eff89272cfd0cb224f850b3ee2fbe50cb852b0120323f3874b4bfbcd1ea34c0f SHA512 42ca7fddcf0b8dbe4cbaf0076271df0806806e5e5d4c33e65b643d063ca7744f147abc379dd7475692d15e22cd991a286769013bfbf843158072140d3f3dc310 WHIRLPOOL 3065ee973ad1c5f435aa7e1aa4e2cd2271e1bd810a94fd64fbefa995c57be0e73b8108f457761b329bd5d05d6029de407ec815b8332920e3bf30589256012cf5
+AUX clamav-0.99.2-gcc-6.patch 4476 SHA256 b2960553243392a4298f37d5ef537296e989e95f7cc084800b8e3ab6a251be6d SHA512 b30ed8b888af3697294c1a2aa96a335b3b1035f4f76e3bcf6c243dca7bdc5921a9bb182fbfd5e0e7f1bb9dce93b2312927e28f78edae466d31200a2be50f3a85 WHIRLPOOL a3a03f600edc287984aedcdf23369071691022a78f192d0ee5d9eec14243fcac26f9b7189fbd3baa8d4ab2906e8db37a427d60c8dae4fc5b835f44a308f22cc3
+AUX clamav-0.99.2-tinfo.patch 656 SHA256 6e68af3dcc41a693ca5f8a191a59a732e014c42ea58e902d62799f3cbc20c7e3 SHA512 33e375e8f4e74f284e9d14adaa8ef095bdb67b2f62e4b7c5e9c38a3c5f955106173e402859fabf44ada40ae08cceb3fca79322f8854f47d850816064641f4451 WHIRLPOOL d0ea141ca3495316dd462c30ee6311e9dc5d752c60e50b1f825c5b7a367d8ab8a7cb9d16574c35b7de901096811098ddbf77189595c7dda7c75b267f6a7aaeae
 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 307 SHA256 6fde803fe67a73f7f17681a9c7db7bdaa6cdcc227a15ec03c8067e43899eec9d SHA512 19e49cfef98d8f3c213bb291cd9c622c1bd1b7c255feef8ccdffddea38893631f2446a4f4f3718cbb87a07bac339805fc78ddacce0b2a55a180f2d23e5b8ad48 WHIRLPOOL ffc84b00f5bafd9487801262dc40368632ed0d023837b691d16ba65d0011957c8bb1ce9671a209f194e5411f7b379de215ddbf7110636f719bafe3921501b0b6
@@ -20,6 +22,7 @@ DIST clamav-0.98.4.tar.gz 15537593 SHA256 d3006747abcf750f395a8bfa8267ab314c7b63
 DIST clamav-0.98.5.tar.gz 15146379 SHA256 9c2f37d5fa9033936468237f6f4b29289f30791caa84765ef510acb56c8daa4d SHA512 4fd3af9e8e828b426ac4aaa867b356df05eb84396b62ab02715630683371f5a9b7a417d495236952a5e112b700ec0304c3760351855d10edc9fa8c032a64c52c WHIRLPOOL d7d32199c9fed92a6a7dd827f7ddac9b6a9689f29d315a7f525d8cf9e96bcf37087b743cc0b181d7e76f6f47897ac93f587de9f9ed336bd7a7552a320608332a
 DIST clamav-0.98.7.tar.gz 15118851 SHA256 282417b707740de13cd8f18d4cbca9ddd181cf96b444db2cad98913a5153e272 SHA512 acf01961472c13ccb219420cc3fa3c3e6f8a733edef371dbc04ce5867900aa1535e956ec8ad50d31c8f872a0a1d79fcccac944cd86e29ecdfa4af18f7fd5afb9 WHIRLPOOL c9f2e6f52f07f68bdcccf55ca1aab0bf3deaa6963279459d64ecca076a9ed0ef53c25996b2b673e9746833822df24689a9fab0654064c5ee6ed372a86966fbb6
 DIST clamav-0.98.tar.gz 37075245 SHA256 113450537f46ed47f010a179be333a0dcd79eac13f264dce26db7aac8d52b3b6 SHA512 532f9fa2616065879b3ecace2672fad26cf3863943e0ecb8835fbed7e5907600ef50b8df820a08a6586bf77c9bf7c6e50af671f31b7c3ee372c31745a173099f WHIRLPOOL a4ee9efd09193aee7fd740dbb60acabdd4a1f6d5171a4e0fa220441457e3431bf99b27c7300ca0e3e124bb5406f65acf106fa51bfc34d87335ca83ccbc942979
+DIST clamav-0.99.2.tar.gz 16067497 SHA256 167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a SHA512 7744ba8a344b163cf98e9737cddfd25d2120b34ee9c4518380e028c9ec3cd50127b198b0dfa9fde30f5ce9aab0c0e6384712fbc11287e77d16ce052fd7b6ac44 WHIRLPOOL 371dc56c3ffa0ff40381d451687a9331a0587943a048604c6667e1018fbfe5559b023654d29f47505bd69a1a44f88adfb5b93b7c55c8cbc6f0bbfcbf836bf631
 DIST clamav-0.99.tar.gz 15968038 SHA256 d2792c8cfadd685fffc40b2199679628815df031fd3149ccf961649fc8787ea9 SHA512 328e66fa412ba61f5e44c839b254c7a84d2ce7821fda6cf29e4ee9532c06e45bdec62f202ca561223e984fff170bfd8280e5cc8e306c09a3017b17e7db3bbf56 WHIRLPOOL 696b425c0d3a6639d627e6dba000a57c4e532232f9f42a564a992c0b459d8041a1947b09548d99b621a5685c78d91045adf4b61731242f55eda2b8d5150fc8b8
 EBUILD clamav-0.97.8-r2.ebuild 4135 SHA256 689911934856c0a2ab985e4247f81553531b6e89479e2996dc5b0f8f351a90df SHA512 4962ff4198a9754efabee3b9b36930d9393841f02ac73b4a1c2b353defc2a81dc1517124dc19d1e0fcbae64a1f3d9271679092994223470361a60cba242c8ce4 WHIRLPOOL 3885f434178562ce39053b723dddc6662049f3cd92129dcfb61965ce5e9558190b67c18e4fcbcdd145842bab8989d273b2f3be37ae08d48748073615ee667a39
 EBUILD clamav-0.97.8.ebuild 3809 SHA256 6759b6fc1154459067b3aa9dd86e9a623e1372146081c5867f615c7567e6744f SHA512 8e0ef02f76d360a330bd1c0380a0aa4b645ef3a0b7844ccf9940ac599f8a09ca02247f55d1c2908cb12ae8cdcbc4a07e87b6dbc3e1614736b087f00bd6246298 WHIRLPOOL 2b3cfab0847916e5834ca0d575b363d0b5856eb708bfaf427a2927e4a1c1b64b02212fbec35dbfaf6b9e604f9bd25fc7d4373892f5dd73c7befdc446a5f13eea
@@ -28,4 +31,5 @@ EBUILD clamav-0.98.4.ebuild 4724 SHA256 e008e0564f4d9a44dccd24aa92bc83f868b387eb
 EBUILD clamav-0.98.5.ebuild 4786 SHA256 39080bf04b4df567a6309e9f7fb2eb5fa0be2eae7aaeaaf54e829c628424947b SHA512 f4e38795495dd41381e67d4493d596c26dbd6e3a721a34928e2eb642e9b7145ad933a9d3840ce9b88913caf98f5b663b2bb13b34210e5054b56dade58822a39d WHIRLPOOL 0f4ab6704aa3f8ff8937a73f3fb522dba556e30b718f73e4ef13d0745d9ec80b861d32f9a6bc4c35938e0cca52efc137406af7572fd418e2eca1499e142d098d
 EBUILD clamav-0.98.7.ebuild 4804 SHA256 2af5f65cd39907ecb300b71f299c4515e98e829bc8a943a9f6a2bf47637c5c37 SHA512 3aca77c2b5a2399bb2435105e6be2cfe52f4a2bb1a91b1e5b8b35b2addb39e9359b1587fac49f33f526512c7327a60d17f6c51d20e5b2326eccb25190e886f35 WHIRLPOOL 56baf04b799d55794f69be2e8ed5cd869e09ca6515b9fffb1745a0c30185b18700447deb0d151e26d531bd5ac7013312c36f54caf7578a62f66879e2332486c3
 EBUILD clamav-0.98.ebuild 4501 SHA256 a9184da412054899bed4f9b7e9fe544b93fd71c04b7febc1d16f8c365f550612 SHA512 c1512232af2331867731d3eb2b8d7ff046c28ea4f6f02722ab9e93a078b12cb21ed6071ff93112edf05fe4671a7697722b4797a4650aa33628609066a3754bc2 WHIRLPOOL 918dc18a16748482aad71778d23ad04603f45f3e186ea479680b7f158fdd36de37ce7e96a6c1aa7e3e6201dc60e6cfd628ad59ba4477dc32d51948cb83058a8b
+EBUILD clamav-0.99.2-r1.ebuild 5196 SHA256 3b21f6b6857943ce76375dfe6f00efb00df4f44a14e2d1a663e05fc319441b46 SHA512 c72bf487f889218680ac92ea831e4075ab37d72ea0fa494c372d406a97ccd8932ef3d10dc2bb52b464abe4e241b8f3c798c9368dd865e0467088be797729bb0c WHIRLPOOL d9b5593925c045681fb229e5150d12ab188472dfc72666f89cc2ee0496e9fce3968be94bd252ea5365c5eb96e58e6c056cbade696af6ba48302419a4dd3a7295
 EBUILD clamav-0.99.ebuild 5050 SHA256 96cb14c4c2d2d62da29f3026169fa3a6860d17163f5575b583522875bd6b915c SHA512 81891ad7c40da637133f15f3aec272099cf180968301bb9c56bb85d71e9309ef290f755e0ba614af62ff4412e8f67399aee29f5b49b8a6aef97f2c6ed40367e8 WHIRLPOOL 34d8bbcb79fb83c0ff83bf3b25ca089319d1429ca957ca960d0b34f42e1212036b1d739d78dbc5e8c4d14be87bf796a0f1e2ad0f6a7a0526e5bc78999fcdc91c
diff --git a/app-antivirus/clamav/clamav-0.99.2-r1.ebuild b/app-antivirus/clamav/clamav-0.99.2-r1.ebuild
new file mode 100644
index 00000000..a4b711a8
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.99.2-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="http://www.clamav.net/"
+# no longer on sf.net from 0.99.2 onwards
+SRC_URI="https://www.clamav.net/downloads/production/${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 libressl milter metadata-analysis-api selinux static-libs systemd uclibc"
+
+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 ) )
+	dev-libs/libtommath
+	>=sys-libs/zlib-1.2.2
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-devel/libtool
+	>dev-libs/libpcre-6
+	!!<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
+# http://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-6.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${PN}-0.99-zlib.patch
+	"${FILESDIR}"/${PN}-0.98.4-x32.patch
+)
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	use ppc64 && append-flags -mminimal-toc
+	use uclibc && export ac_cv_type_error_t=yes
+
+	econf \
+		$(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) \
+		--cache-file="${S}"/config.cache \
+		--disable-experimental \
+		--disable-gcc-vcheck \
+		--disable-zlib-vcheck \
+		--enable-id-check \
+		--with-dbdir="${EPREFIX}"/var/lib/clamav \
+		--with-system-tommath \
+		--with-zlib="${EPREFIX}"/usr
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav
+	newinitd "${FILESDIR}"/clamd.initd-r6 clamd
+	newconfd "${FILESDIR}"/clamd.conf-r1 clamd
+
+	if use systemd; then
+		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"
+	fi
+
+	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
+
+		use systemd && 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
+}
+
+# vi: set diffopt=iwhite,filler:
diff --git a/app-antivirus/clamav/files/clamav-0.98.4-x32.patch b/app-antivirus/clamav/files/clamav-0.98.4-x32.patch
index 0d8dd5b6..271aa9ec 100644
--- a/app-antivirus/clamav/files/clamav-0.98.4-x32.patch
+++ b/app-antivirus/clamav/files/clamav-0.98.4-x32.patch
@@ -1,5 +1,5 @@
---- libclamav/bignum_fast.h.dist	2014-11-12 01:43:11.034069241 +0000
-+++ libclamav/bignum_fast.h	2014-11-12 01:46:42.065459358 +0000
+--- a/libclamav/bignum_fast.h.dist	2014-11-12 01:43:11.034069241 +0000
++++ b/libclamav/bignum_fast.h	2014-11-12 01:46:42.065459358 +0000
 @@ -18,7 +18,7 @@
  #ifndef TFM_H_
  #define TFM_H_
diff --git a/app-antivirus/clamav/files/clamav-0.99.2-gcc-6.patch b/app-antivirus/clamav/files/clamav-0.99.2-gcc-6.patch
new file mode 100644
index 00000000..2031edbd
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.99.2-gcc-6.patch
@@ -0,0 +1,84 @@
+diff --git a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
+index 59ff6aa..1325394 100644
+--- a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
++++ b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
+@@ -169,3 +169,3 @@ public:
+       KeyLength+1;
+-    unsigned Alignment = alignof<StringMapEntry>();
++    unsigned Alignment = alignOf<StringMapEntry>();
+ 
+diff --git a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
+index 88044c7..86b0f40 100644
+--- a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
++++ b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
+@@ -417,3 +417,3 @@ namespace llvm {
+           ileAllocator.Allocate(sizeof(IndexListEntry),
+-          alignof<IndexListEntry>()));
++          alignOf<IndexListEntry>()));
+ 
+diff --git a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
+index 6a7a1a6..979e597 100644
+--- a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
++++ b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
+@@ -51,8 +51,8 @@ struct AlignOf {
+ 
+-/// alignof - A templated function that returns the mininum alignment of
++/// alignOf - A templated function that returns the mininum alignment of
+ ///  of a type.  This provides no extra functionality beyond the AlignOf
+ ///  class besides some cosmetic cleanliness.  Example usage:
+-///  alignof<int>() returns the alignment of an int.
++///  alignOf<int>() returns the alignment of an int.
+ template <typename T>
+-static inline unsigned alignof() { return AlignOf<T>::Alignment; }
++static inline unsigned alignOf() { return AlignOf<T>::Alignment; }
+ 
+diff --git a/libclamav/c++/llvm/include/llvm/Support/Allocator.h b/libclamav/c++/llvm/include/llvm/Support/Allocator.h
+index 4a7251f..17caf5e 100644
+--- a/libclamav/c++/llvm/include/llvm/Support/Allocator.h
++++ b/libclamav/c++/llvm/include/llvm/Support/Allocator.h
+@@ -203,3 +203,3 @@ public:
+       for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) {
+-        Ptr = Allocator.AlignPtr(Ptr, alignof<T>());
++        Ptr = Allocator.AlignPtr(Ptr, alignOf<T>());
+         if (Ptr + sizeof(T) <= End)
+diff --git a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
+index b892d85..dc72346 100644
+--- a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
++++ b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
+@@ -495,3 +495,3 @@ void SCEVUnknown::print(raw_ostream &OS) const {
+   if (isAlignOf(AllocTy)) {
+-    OS << "alignof(" << *AllocTy << ")";
++    OS << "alignOf(" << *AllocTy << ")";
+     return;
+diff --git a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
+index 824021c..757ca50 100644
+--- a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
++++ b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
+@@ -569,3 +569,3 @@ void Emitter<CodeEmitter>::emitMemModRMByte(const MachineInstr &MI,
+   // Calculate what the SS field value should be...
+-  static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 };
++  static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u };
+   unsigned SS = SSTable[Scale.getImm()];
+diff --git a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
+index 9564fe0..b2b7986 100644
+--- a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
++++ b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
+@@ -332,3 +332,3 @@ void X86MCCodeEmitter::EmitMemModRMByte(const MCInst &MI, unsigned Op,
+   // Calculate what the SS field value should be...
+-  static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 };
++  static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u };
+   unsigned SS = SSTable[Scale.getImm()];
+diff --git a/libclamav/mpool.c b/libclamav/mpool.c
+index cd38e15..b5e537d 100644
+--- a/libclamav/mpool.c
++++ b/libclamav/mpool.c
+@@ -417,3 +417,3 @@ static size_t from_bits(unsigned int bits) {
+ 
+-static inline unsigned int alignof(size_t size)
++static inline unsigned int alignOf(size_t size)
+ {
+@@ -609,3 +609,3 @@ static void* allocate_aligned(struct MPMAP *mpm, size_t size, unsigned align, co
+ void *mpool_malloc(struct MP *mp, size_t size) {
+-  size_t align = alignof(size);
++  size_t align = alignOf(size);
+   size_t i, needed = align_increase(size+FRAG_OVERHEAD, align);
diff --git a/app-antivirus/clamav/files/clamav-0.99.2-tinfo.patch b/app-antivirus/clamav/files/clamav-0.99.2-tinfo.patch
new file mode 100644
index 00000000..4593d168
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.99.2-tinfo.patch
@@ -0,0 +1,23 @@
+--- a/m4/reorganization/clamdtop.m4
++++ b/m4/reorganization/clamdtop.m4
+@@ -4,12 +4,20 @@
+ 
+ if test "$enable_clamdtop" != "no"; then
+ 
++PKG_CHECK_MODULES([CURSES],[ncurses],
++	[HAVE_LIBNCURSES=yes; CURSES_INCLUDE="<ncurses.h>"],
++	[HAVE_LIBNCURSES=no],
++)
++
++if test "X$HAVE_LIBNCURSES" != "Xyes"; then
++    HAVE_LIBNCURSES=
+ AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
+ 	    AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
+ 			    [initscr(); KEY_RESIZE;]),
+ 	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
+ 	     CURSES_INCLUDE="<ncurses/ncurses.h>"],
+ 	    [])
++fi
+ 
+ if test "X$HAVE_LIBNCURSES" != "Xyes"; then
+     HAVE_LIBNCURSES=