Version bump.

Package-Manager: portage-2.0.51.21-r1

4 files changed, 117 insertions, 5 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 1b68b404f671..e8da6f4106f6 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.67 2005/05/16 09:23:24 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.68 2005/05/16 23:22:50 ticho Exp $
+
+*clamav-0.85.1 (16 May 2005)
+
+  16 May 2005; Andrej Kacian <ticho@gentoo.org> +clamav-0.85.1.ebuild:
+  Version bump.
 
   16 May 2005; Andrej Kacian <ticho@gentoo.org> files/clamd.rc.new:
   Added "-d" to freshclam start options in the new initscript. Suggested by
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index b740fdfeca90..9052a6a4e7c1 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -3,12 +3,14 @@ Hash: SHA1
 
 MD5 34a649543043b4506c5ecdca94ddad41 clamav-0.85.ebuild 2314
 MD5 bf2cf15ce5fddd93fffa28e8b0a3f50f clamav-0.84.ebuild 2314
+MD5 502b2e8df24dcd638791aa412278efcc clamav-0.85.1.ebuild 3289
 MD5 689c7676f16b3126b2c3f9271f7c2a1e clamav-0.85-r1.ebuild 3290
-MD5 a246521b40d345ac5f3cb584e82ac360 ChangeLog 14327
+MD5 c8a9f277a409c91341abc0c3e9d0a0d3 ChangeLog 14445
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 MD5 6ea55388f51845c2f815589dfed047a4 clamav-0.83.ebuild 2332
 MD5 0bd0d31062475433335752e126830799 files/digest-clamav-0.85-r1 64
 MD5 ad7d45b1be51c06986cb42c53e733d19 files/clamav-milter.README.gentoo 1311
+MD5 102cc388dbea3446ba249cfc2e80cff3 files/digest-clamav-0.85.1 66
 MD5 9bbf2754f8178fd5164875d784aa9ffa files/digest-clamav-0.83 64
 MD5 3e9877b8901f604bd65ea89ff18833b6 files/digest-clamav-0.84 64
 MD5 0bd0d31062475433335752e126830799 files/digest-clamav-0.85 64
@@ -18,7 +20,7 @@ MD5 1b3268d3723e003ad99bf706e6bf4312 files/clamd.rc 1444
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCiGawQlM6RnzZP+IRApeTAKC7saPbmGo2hQ3AoeFyoI/HaPxX9ACeNSOG
-tx+wRqdM273uJzfRFsIsfC4=
-=AVwd
+iD8DBQFCiStUQlM6RnzZP+IRAt9CAKCNjle7Em9X2UTE+DEPmaw5yJtYAgCfZpzP
+QDZLTPZ4mh9XsmG95GLFcpU=
+=DCnp
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.85.1.ebuild b/app-antivirus/clamav/clamav-0.85.1.ebuild
new file mode 100644
index 000000000000..219447934d8f
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.85.1.ebuild
@@ -0,0 +1,104 @@
+# 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.85.1.ebuild,v 1.1 2005/05/16 23:22:50 ticho Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="http://www.clamav.net/"
+SRC_URI="mirror://sourceforge/clamav/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~hppa ~alpha ~ppc64 ~ia64"
+IUSE="crypt milter selinux"
+
+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 ! built_with_use mail-mta/sendmail milter; 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 /bin/false /dev/null clamav
+	pwconv || die
+}
+
+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"
+
+	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
+	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
+}
+
+pkg_postinst() {
+	echo
+	ewarn "As of 0.85-r1, all settings from /etc/conf.d/clamd are ignored, except for"
+	ewarn "START_CLAMD and START_FRESHCLAM. All settings are read from /etc/clamd.conf"
+	ewarn "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 howto setup the clamav-milter..."
+		einfo ""
+		einfo "less /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
+		echo
+	fi
+}
diff --git a/app-antivirus/clamav/files/digest-clamav-0.85.1 b/app-antivirus/clamav/files/digest-clamav-0.85.1
new file mode 100644
index 000000000000..56f3267da58d
--- /dev/null
+++ b/app-antivirus/clamav/files/digest-clamav-0.85.1
@@ -0,0 +1 @@
+MD5 b0675c3273785d61eefc1afa304745c0 clamav-0.85.1.tar.gz 4061042