Version bump, bug #231287

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64

3 files changed, 155 insertions, 16 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 7f1fd8e6885d..55441955afd7 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.291 2008/06/11 12:58:06 falco Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.292 2008/07/20 21:50:15 dertobi123 Exp $
+
+*clamav-0.93.3 (20 Jul 2008)
+
+  20 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +clamav-0.93.3.ebuild:
+  Version bump, bug #231287
 
 *clamav-0.93.1 (11 Jun 2008)
 
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 0941389284e1..e4fa45af8cb5 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX clamav-0.90-compat.patch 585 RMD160 3ee74f163bd8b4440f06773ec7abe3bcec1fff79 SHA1 fedfe373a6a911230c553fd5a095c8acb72b4ce2 SHA256 7a646386f74bc9094bd39d6762b78ef74310678cdef5484650e0aa242cf570e9
 AUX clamav-0.90-nls.patch 2531 RMD160 442990f305b47bd0eb4c459e9ed054612259992e SHA1 4e74b895739ff1aa1929a444f9e89dbe0f18a30c SHA256 b160e11ee12df6634cb8d524816f8bba08c7cd5b6154f9bff671423a8e0031a3
 AUX clamav-0.91.2-CVE-2007-5759.patch 1852 RMD160 13ff700734cca239c7960dbd1a0e7a9c4c6d4b72 SHA1 48707d513348dd87ff74beaff7370a91a097acec SHA256 78ce1337e563b6db5d7604efb14aebf9b9bf02330dd67c4d50a6e231f1921e0d
@@ -17,6 +14,7 @@ DIST clamav-0.91.2.tar.gz 13394538 RMD160 9e181a7a4fd08377ff47663aed27f8cc97249a
 DIST clamav-0.92.1.tar.gz 15284752 RMD160 5cf4b36a665dba6be366e94d02b6c8112048d647 SHA1 6ee4fa5a1c5f71eecc99beb17bc5f3c5a3b580ec SHA256 e08a63adb3eda3dfc190d7a8b3fa55c881b1632583fbdf67327d3767d6966581
 DIST clamav-0.92.tar.gz 14300798 RMD160 37f0450b9b3c6fc863f94811ae372ece1677d791 SHA1 b6573acd9a7bb6bf3bd4b39a0102ce0be764c5bc SHA256 d3c8c1e2e0025a354663b330d69c8848c7a5c9d7248204c69362c2924366025e
 DIST clamav-0.93.1.tar.gz 17246314 RMD160 22296401b3ce96a268f0db224e72c31e69090895 SHA1 3306f3cd289aac3793962c9834cd1bd500abfb0c SHA256 c9a3991107dd377a63cfe7866417c5e29b3bffc9332aa5979bcc74ddb78d6bb6
+DIST clamav-0.93.3.tar.gz 18242568 RMD160 8379148790cc545c801709d46b7db87634f43f67 SHA1 01240613b639144fa8fa655825f6587e044a1c1c SHA256 7aa98796671dfe3db5a20e25669404c4e4461d2a6c77de352edf99f2c989e500
 DIST clamav-0.93.tar.gz 16134725 RMD160 a1f301345983ed0606e2f2e13ef63275bd341cd4 SHA1 bae5f70331e8592e9c53a04517038890845d406d SHA256 1fedc2bb4a850c962d6b0938b77b14480297bffa4cbf69ed95c4ee4f35b5db69
 EBUILD clamav-0.91.2-r1.ebuild 4378 RMD160 0e6be1ff7e473b515e2362f1de934866d3fba12f SHA1 e3b13d2e1545a1d9bb37848d17f835628330f288 SHA256 adef8794ef1de7dabaf2ab1ad18886fc5a353ca2ba53dc56355846ea212c4d50
 EBUILD clamav-0.91.2.ebuild 4235 RMD160 1b50e9d66a1f75306ae8117ff8e2cb2ed86df1d4 SHA1 ba43a4bf6031fda6f254e5f56a76e663e00825ee SHA256 c0427934b1d9dfcdae76d6bfbcd3edc2ae385b18d4e33abfe9f2db45aabc55a0
@@ -24,17 +22,7 @@ EBUILD clamav-0.92.1-r1.ebuild 4270 RMD160 b336c4e7bd8d6f4db47870acde83010b8c723
 EBUILD clamav-0.92.1.ebuild 4238 RMD160 984692c8f0655fc8937df0f2a43850d5e5abecfa SHA1 607c0124ff5f7a9171299bf1f447d55c14a706cf SHA256 08d2a538a130bf27ac0c06901bb7e0f3dea9335a7c2c84ebd9115808283cf0b2
 EBUILD clamav-0.92.ebuild 4109 RMD160 87289f95ba172c645c8afa967e09a6aa04fb0403 SHA1 aa06e152e7119cf6ded5aeea320d67f6e3591dee SHA256 676ed0507dcb0f743fa87027ec2daff4343d9a7ec4c1dcd08662150bc7266928
 EBUILD clamav-0.93.1.ebuild 4290 RMD160 54024f30df11a78b08e2683e82f2b818612d87b0 SHA1 28c22161126efdd813d878239e81fbf03e2609d9 SHA256 17c991141ad68190f8d813afc5e1684e2cbd0e4ea60b23ad9be91b671de55e32
+EBUILD clamav-0.93.3.ebuild 4295 RMD160 990a51ca97f84d692c057e37194f1ba5098f52b3 SHA1 44a0a63b5824576f2f24592b25f955af9da8f9f9 SHA256 5b5c22af51b22f9ee25e5322ee150b18cd76700684b9eb3eafeedd33c2f09c3c
 EBUILD clamav-0.93.ebuild 4273 RMD160 ec29f05a2f9e1ed0b18f5bb08be909fd410532ce SHA1 065ba1a4ac328b50834687020990b51ce88ab654 SHA256 0e1405745d566ca2c990e166773c13f57635ee6138dbac26027a233fea0e10f3
-MISC ChangeLog 44446 RMD160 b565c3c0994363b235344982a8401fdf98e0cb60 SHA1 1f88b295416be45a903e5cff5f4b93abaa4ef31b SHA256 1639e5128228a4e1f4599fe4173899bb8a1b174103d5ef8b6834623e9c7ce46c
+MISC ChangeLog 44591 RMD160 328217b650025fc3b3d61973b43078df57bdeb68 SHA1 ead291e95f9cbd860b41819751610f8f0e04acba SHA256 50821ef8a3373343b7eb2ae8ed93b8aa35f7facf96d923c861eb4586b41a8767
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iQEcBAEBAgAGBQJIT8vnAAoJEDvRww8BFPxFDw8H/00LJU+qSTzWPdrHK9H1IiNZ
-bFqnbUKHm2zqT+/3IsNLl373I1PcKwMal1WRKBiitQmMhkWAb5Yybf60KulxqrcN
-fCHyjnsGXoCcKxxHLbBhzxsk9SkvIZ6zETe1YepBuPzC/3o4eUdP6fcyF0bDytpa
-UrvGn2yW0YjxgCOZ/gv74vsiCDZb4Kt2btAUtWG4tdp9D6Mixl8uIXvXY875+Bv3
-C2F7YpAVoEJLit8DZ2GD+e2Xmg/Yoj4gTm/6aIBbqsZYQ/HQutcpEsYsYKRVzP9V
-GMhfKVp7nEKKao83R7FVvW/FxsBG+/t65X3QZI7jOuSVpffv05MA35Rq/HKTxkg=
-=gSxl
------END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.93.3.ebuild b/app-antivirus/clamav/clamav-0.93.3.ebuild
new file mode 100644
index 000000000000..bb5663462f9c
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.93.3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.93.3.ebuild,v 1.1 2008/07/20 21:50:15 dertobi123 Exp $
+
+inherit autotools eutils flag-o-matic fixheadtails multilib
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 crypt iconv mailwrapper milter nls selinux"
+
+DEPEND="virtual/libc
+	bzip2? ( app-arch/bzip2 )
+	crypt? ( >=dev-libs/gmp-4.1.2 )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	iconv? ( virtual/libiconv )
+	nls? ( sys-devel/gettext )
+	dev-libs/gmp
+	>=sys-libs/zlib-1.2.1-r3
+	>=sys-apps/sed-4"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-clamav )
+	sys-apps/grep"
+PROVIDE="virtual/antivirus"
+
+pkg_setup() {
+	if use milter; then
+		if [ ! -e /usr/$(get_libdir)/libmilter.a ] ; then
+			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
+			ewarn "USE flag, or mail-filter/libmilter package."
+		fi
+	fi
+
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.93-buildfix.patch
+	epatch "${FILESDIR}"/${PN}-0.93-nls.patch
+
+	# If nls flag is disabled, gettext may not be available, but eautoreconf
+	# needs this file (bug #218892).
+	use nls || cp "${FILESDIR}"/lib-ld.m4 m4/
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
+
+	local myconf
+
+	# we depend on fixed zlib, so we can disable this check to prevent redundant
+	# warning (bug #61749)
+	myconf="${myconf} --disable-zlib-vcheck"
+	# use id utility instead of /etc/passwd parsing (bug #72540)
+	myconf="${myconf} --enable-id-check"
+	use milter && {
+		myconf="${myconf} --enable-milter"
+		use mailwrapper && \
+			myconf="${myconf} --with-sendmail=/usr/sbin/sendmail.sendmail"
+	}
+
+	ht_fix_file configure
+	econf ${myconf} \
+		$(use_enable bzip2) \
+		$(use_enable nls) \
+		$(use_with iconv) \
+		--disable-experimental \
+		--with-dbdir=/var/lib/clamav || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ
+	newconfd "${FILESDIR}"/clamd.conf clamd
+	newinitd "${FILESDIR}"/clamd.rc clamd
+	dodoc "${FILESDIR}"/clamav-milter.README.gentoo
+
+	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
+
+	# Change /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
+		echo "
+START_MILTER=no
+MILTER_NICELEVEL=19" \
+			>> "${D}"/etc/conf.d/clamd
+		echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \
+			>>"${D}"/etc/conf.d/clamd
+		echo "MILTER_OPTS=\"-m 10 --timeout=0\"" \
+			>>"${D}"/etc/conf.d/clamd
+	fi
+
+	diropts ""
+	dodir /etc/logrotate.d
+	insopts -m0644
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	echo
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter"
+		elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
+		echo
+	fi
+	ewarn "The soname for libclamav has changed in clamav-0.93."
+	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."
+	echo
+}