Version bump, bug 333337 fixes also bug 326199.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 148 insertions, 2 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 7788449453c1..b3cdbfd43dac 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.360 2010/06/05 14:58:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.361 2010/09/14 12:22:49 idl0r Exp $
+
+*clamav-0.96.2 (14 Sep 2010)
+
+  14 Sep 2010; Christian Ruppert <idl0r@gentoo.org> +clamav-0.96.2.ebuild:
+  Version bump, bug 333337 fixes also bug 326199.
 
   05 Jun 2010; Raúl Porcel <armin76@gentoo.org> clamav-0.96.1.ebuild:
   alpha/ia64/sparc stable wrt #321157
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index be78dc983484..431fcfa7c93c 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -5,8 +5,10 @@ AUX clamav.logrotate 355 RMD160 f59cd8ce96da8210aa858ee59ee3b6940e3253a6 SHA1 5f
 AUX clamd.conf 234 RMD160 b517b05e587637cbdd443f7ca3625d582e32722f SHA1 564b1e2f6cf85567f69f2e20cbc942967fa6304b SHA256 17bf4fe3596dc5b145e4163d85181e2edcaa214df3cf9072d852ba0e7a569891
 AUX clamd.rc 2839 RMD160 3dae59c683e5c3566ab0c8c14e20c1da64646054 SHA1 ed542b9c1259ccaff12ba8949c375e012225bbdd SHA256 0508ad290f20e5a785fb932ee6c5d7e4413cc068ece3dcd1f4dd5b2d3cce01c9
 DIST clamav-0.96.1.tar.gz 40568982 RMD160 f0708b921c8b01a4309fe741ec141ab8cbdf2351 SHA1 cdb24490f402748cbfb57cc87592fe77b470e0a5 SHA256 413dd25907059068da2a367d2b330fbc37d5d2764eb3b047214ce754a9ca74ea
+DIST clamav-0.96.2.tar.gz 59109021 RMD160 d2d9fc9c7759c5b76072032b0d513eede19b978b SHA1 1b7621a9829f1f0020901ce350d0e6112745c34d SHA256 6aa0b0d96ed25ffb4b5aca53f6348978c94771503c299f86e480fef475abcefa
 DIST clamav-0.96.tar.gz 39792593 RMD160 d9147d1da4fc7fa3e8d42b25c58a93f6bbaa588b SHA1 be7cb37f2a6121cacc3cd3969eee212b96ef6b57 SHA256 7b0b6e67c87d43b04ce3beceaecddfaf344499f0ee45e9568df6be16808879d2
 EBUILD clamav-0.96.1.ebuild 4112 RMD160 96223ff191ec334cdcce42c52801cd81dbbfcb4f SHA1 38384a7c7bf15133c64e05eebf198484c2250e70 SHA256 86f9668021cb06dcb071be932b4ec39752d38a4eefa1e24ac07f90095a42fcb1
+EBUILD clamav-0.96.2.ebuild 4118 RMD160 87c05d6b8d856e44a26c2e7feaa8b8de724a1dbd SHA1 5326c02b478f0cfc8df9bccf8bd95298bd255ae3 SHA256 c68bed02c3a3568e0f2ae23088cace90bb0d80b42e942d9d3d4533f8ba810afa
 EBUILD clamav-0.96.ebuild 4109 RMD160 a4e65643997c22c70dfcfd23dbab0e49deca3b48 SHA1 9e80b3e5010eadaf928ccebd74e7202893c4c561 SHA256 a97c2006eac1cad62162d1f509bcb4f88a756a0d9b69c1979222bbcbf5362f3b
-MISC ChangeLog 54219 RMD160 594bd8dde29c998f8c2afd7032009e61a677f161 SHA1 67aaefc6293ec7b5540f0e5d3c7fbe85eb7faaf1 SHA256 6e56920ef486cdfa417dbf3b5f1d6aa4f4a0ecbd1449d2ce82fa19e3c89761a7
+MISC ChangeLog 54373 RMD160 d2a8928ed3e3359cb5c686eb34db40e69d84ff7b SHA1 9cf94bcf9f1146687bebb927b3e9f49f169a99b5 SHA256 1d953b159828a5500d7935fedb99807dab864710fe1a83f7bf2867659ab69c2e
 MISC metadata.xml 320 RMD160 3546393e30d87f0b0a2fb17e2f15f57dd8c19661 SHA1 b959e38933418e6fc818ed40cd9a4921b8c66102 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d
diff --git a/app-antivirus/clamav/clamav-0.96.2.ebuild b/app-antivirus/clamav/clamav-0.96.2.ebuild
new file mode 100644
index 000000000000..9164d103e97c
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.96.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.96.2.ebuild,v 1.1 2010/09/14 12:22:49 idl0r Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic fixheadtails multilib versionator
+
+# for when rc1 is appended to release candidates:
+MY_PV=$(replace_version_separator 3 '');
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="http://www.clamav.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 clamdtop iconv milter selinux ipv6"
+
+COMMON_DEPEND="bzip2? ( app-arch/bzip2 )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	iconv? ( virtual/libiconv )
+	clamdtop? ( sys-libs/ncurses )
+	>=sys-libs/zlib-1.2.1-r3
+	>=sys-apps/sed-4"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/pkgconfig-0.20"
+
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-clamav )
+	sys-apps/grep"
+
+PROVIDE="virtual/antivirus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.95.1-nls.patch"
+}
+
+src_configure() {
+	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
+
+	ht_fix_file configure
+	econf  \
+		$(use_enable bzip2) \
+		$(use_enable ipv6) \
+		$(use_enable clamdtop) \
+		$(use_enable milter) \
+		$(use_with iconv) \
+		--disable-experimental \
+		--enable-id-check \
+		--disable-zlib-vcheck \
+		--with-dbdir=/var/lib/clamav || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ
+	newconfd "${FILESDIR}/clamd.conf" clamd
+	newinitd "${FILESDIR}/clamd.rc" clamd
+
+	dodir /var/run/clamav
+	keepdir /var/run/clamav
+	fowners clamav:clamav /var/run/clamav
+	dodir /var/log/clamav
+	keepdir /var/log/clamav
+	fowners clamav:clamav /var/log/clamav
+
+	# Modify /etc/clamd.conf to be usable out of the box
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
+		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
+		-e "s:.*\(User\) .*:\1 clamav:" \
+		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
+		-e "s:^\#\(LogTime\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${D}"/etc/clamd.conf
+
+	# Do the same for /etc/freshclam.conf
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
+		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+		-e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
+		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${D}"/etc/freshclam.conf
+
+	if use milter; then
+		# And again same for /etc/clamav-milter.conf
+		# 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 /var/run/clamav/clamav-milter.pid:" \
+			-e "s+^\#\(ClamdSocket\) .*+\1 unix:/var/run/clamav/clamd.sock+" \
+			-e "s:.*\(User\) .*:\1 clamav:" \
+			-e "s+^\#\(MilterSocket\) /.*+\1 unix:/var/run/clamav/clamav-milter.sock+" \
+			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+			-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \
+			"${D}"/etc/clamav-milter.conf
+	fi
+
+	if use milter ; then
+		cat << EOF >> "${D}"/etc/conf.d/clamd
+MILTER_NICELEVEL=19
+START_MILTER=no
+EOF
+	fi
+
+	diropts ""
+	dodir /etc/logrotate.d
+	insopts -m0644
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter"
+		elog "read the clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+		elog
+	fi
+	ewarn "The soname for libclamav has changed in clamav-0.95."
+	ewarn "If you have upgraded from that or earlier version, it is"
+	ewarn "recommended to run revdep-rebuild, in order to fix anything"
+	ewarn "that links against libclamav.so library."
+}