Version bump. Fixes security bug #109213.

(Portage version: 2.0.53_rc7)

4 files changed, 131 insertions, 6 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 0b8d73c59154..abe4b944b38c 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.114 2005/10/02 11:06:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.115 2005/11/03 23:22:52 ticho Exp $
+
+*clamav-0.87.1 (03 Nov 2005)
+
+  03 Nov 2005; Andrej Kacian <ticho@gentoo.org> +clamav-0.87.1.ebuild:
+  Version bump. Fixes security bug #109213.
 
   02 Oct 2005; Aron Griffis <agriffis@gentoo.org> ChangeLog:
   Mark 0.87 stable on ia64
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index f8d6c5c607b2..068ec28c4a53 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,10 +1,12 @@
-MD5 9845a5e672942a8134ad748b3862221e clamav-0.87.ebuild 3689
-MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 MD5 586011df06b0dd6eb10f4d9c528e8dcf ChangeLog 20238
 MD5 61c732b815d6224b12e0ce8d9b61278f clamav-0.86.2.ebuild 3685
+MD5 9c06c6cab987c64591a7270a494f49f2 clamav-0.87.1.ebuild 3594
+MD5 9845a5e672942a8134ad748b3862221e clamav-0.87.ebuild 3689
+MD5 08f7b320461c04bbb88555e389c2e544 files/clamav-milter.README.gentoo 1124
+MD5 e29ee77ca9bfe28ed18dbf67a9c90e75 files/clamd.conf 193
+MD5 57ccf69fd65dfbb62e50aa0b27b29754 files/clamd.rc 2028
 MD5 9b6f44bf151d0091e67a26007bf08255 files/clamd.rc.new 2037
 MD5 8365b1166d97452566de3f0f5140ab43 files/digest-clamav-0.86.2 66
-MD5 e29ee77ca9bfe28ed18dbf67a9c90e75 files/clamd.conf 193
-MD5 08f7b320461c04bbb88555e389c2e544 files/clamav-milter.README.gentoo 1124
 MD5 17e487f0452933ea8ab559a404329cf2 files/digest-clamav-0.87 64
-MD5 57ccf69fd65dfbb62e50aa0b27b29754 files/clamd.rc 2028
+MD5 25387621d9eaf247726bf74459264749 files/digest-clamav-0.87.1 66
+MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
diff --git a/app-antivirus/clamav/clamav-0.87.1.ebuild b/app-antivirus/clamav/clamav-0.87.1.ebuild
new file mode 100644
index 000000000000..4f584ae8d863
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.87.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.87.1.ebuild,v 1.1 2005/11/03 23:22:52 ticho Exp $
+
+inherit eutils flag-o-matic fixheadtails
+
+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"
+IUSE="crypt milter selinux mailwrapper"
+
+DEPEND="virtual/libc
+	crypt? ( >=dev-libs/gmp-4.1.2 )
+	milter? ( mail-mta/sendmail )
+	>=sys-libs/zlib-1.2.1-r3
+	>=net-misc/curl-7.10.0
+	net-dns/libidn
+	>=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/lib/libmilter.a ] ; then
+			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
+			ewarn "USE flag. Either recompile sendmail with milter USE flag enabled, or disable"
+			ewarn "this flag for clamav as well to disable milter support."
+			die "need milter-enabled sendmail"
+		fi
+	fi
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+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} --with-dbdir=/var/lib/clamav || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ INSTALL
+	newconfd ${FILESDIR}/clamd.conf clamd
+	newinitd ${FILESDIR}/clamd.rc.new 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:" \
+		${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:^\#\(LogFile\) .*:\1 /var/log/freshclam.log:" \
+		-e "s:^\#\(LogTime\).*:\1:" \
+		${D}/etc/freshclam.conf
+
+	if use milter ; then
+		echo "START_MILTER=no" \
+			>> ${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
+}
+
+pkg_postinst() {
+	echo
+	ewarn "As of 0.85-r1, all settings from /etc/conf.d/clamd are ignored, except for"
+	ewarn "START_CLAMD, START_FRESHCLAM and MILTER related options. All settings are"
+	ewarn "read from /etc/clamd.conf and /etc/freshclam.conf, so double-check these two files."
+	echo
+	ewarn "Warning: clamd and/or freshclam have not been restarted."
+	ewarn "You should restart them with: /etc/init.d/clamd restart"
+	echo
+	if use milter ; then
+		einfo "For simple instructions how to setup the clamav-milter type:"
+		echo "  zless /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
+		echo
+	fi
+}
diff --git a/app-antivirus/clamav/files/digest-clamav-0.87.1 b/app-antivirus/clamav/files/digest-clamav-0.87.1
new file mode 100644
index 000000000000..772c4035ccb7
--- /dev/null
+++ b/app-antivirus/clamav/files/digest-clamav-0.87.1
@@ -0,0 +1 @@
+MD5 bf9f038edf0b6d5f76552e1b8d014b81 clamav-0.87.1.tar.gz 4468992