Point clamav to correct sendmail binary. Bug #96373.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 41 insertions, 22 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 317ac963543a..bfe23af935c1 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.82 2005/06/18 10:51:53 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.83 2005/06/18 20:35:18 ticho Exp $
+
+  18 Jun 2005; Andrej Kacian <ticho@gentoo.org> clamav-0.86_rc1.ebuild:
+  Point clamav to correct sendmail binary if mailwrapper USE flag is enabled.
+  Closes bug #96373, by Analyzer <subscribe2k at yandex.ru>. Also fix head
+  syntax (fixheadtails.eclass) in configure.
 
   18 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   clamav-0.85.1-r1.ebuild:
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 928534030daf..abee4e191643 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,20 +1,30 @@
-MD5 6ea55388f51845c2f815589dfed047a4 clamav-0.83.ebuild 2332
-MD5 da756bc75182c5c3772a6d12af33a835 clamav-0.86_rc1.ebuild 3610
-MD5 921a56174bc3634808df37537d77ea1d clamav-0.85.1.ebuild 3326
-MD5 73c5f5661cf66137aa14ba91d833f32a clamav-0.85.1-r1.ebuild 3567
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 34a649543043b4506c5ecdca94ddad41 clamav-0.85.ebuild 2314
-MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
-MD5 777a50097877b50fcf959334c399eff0 ChangeLog 16529
-MD5 689c7676f16b3126b2c3f9271f7c2a1e clamav-0.85-r1.ebuild 3290
 MD5 bf2cf15ce5fddd93fffa28e8b0a3f50f clamav-0.84.ebuild 2314
+MD5 73c5f5661cf66137aa14ba91d833f32a clamav-0.85.1-r1.ebuild 3567
+MD5 921a56174bc3634808df37537d77ea1d clamav-0.85.1.ebuild 3326
+MD5 689c7676f16b3126b2c3f9271f7c2a1e clamav-0.85-r1.ebuild 3290
+MD5 3304ead313386e3bf10577005daf6209 clamav-0.86_rc1.ebuild 3748
+MD5 bfe6ed64b0123624511b7a82c80db793 ChangeLog 16799
+MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
+MD5 6ea55388f51845c2f815589dfed047a4 clamav-0.83.ebuild 2332
+MD5 0bd0d31062475433335752e126830799 files/digest-clamav-0.85-r1 64
 MD5 08f7b320461c04bbb88555e389c2e544 files/clamav-milter.README.gentoo 1124
-MD5 1b3268d3723e003ad99bf706e6bf4312 files/clamd.rc 1444
-MD5 f6bf5b894e60e8686cb5a36ba240e1ef files/clamd.rc.new 2032
-MD5 3e9877b8901f604bd65ea89ff18833b6 files/digest-clamav-0.84 64
 MD5 9807ac686d54e104f1c86fc1b0cbf23d files/digest-clamav-0.86_rc1 67
-MD5 9bbf2754f8178fd5164875d784aa9ffa files/digest-clamav-0.83 64
-MD5 e29ee77ca9bfe28ed18dbf67a9c90e75 files/clamd.conf 193
 MD5 102cc388dbea3446ba249cfc2e80cff3 files/digest-clamav-0.85.1 66
-MD5 0bd0d31062475433335752e126830799 files/digest-clamav-0.85-r1 64
-MD5 102cc388dbea3446ba249cfc2e80cff3 files/digest-clamav-0.85.1-r1 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
+MD5 f6bf5b894e60e8686cb5a36ba240e1ef files/clamd.rc.new 2032
+MD5 102cc388dbea3446ba249cfc2e80cff3 files/digest-clamav-0.85.1-r1 66
+MD5 e29ee77ca9bfe28ed18dbf67a9c90e75 files/clamd.conf 193
+MD5 1b3268d3723e003ad99bf706e6bf4312 files/clamd.rc 1444
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD4DBQFCtIW7QlM6RnzZP+IRAjDQAJjpFSddYFePeu8A2CGuIHHLl29wAJ4rKVSR
+yN+ndda/SJGxhv9wnqHgfQ==
+=oX/I
+-----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.86_rc1.ebuild b/app-antivirus/clamav/clamav-0.86_rc1.ebuild
index 47939f117b54..e80a5bcdb2d8 100644
--- a/app-antivirus/clamav/clamav-0.86_rc1.ebuild
+++ b/app-antivirus/clamav/clamav-0.86_rc1.ebuild
@@ -1,8 +1,8 @@
 # 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.86_rc1.ebuild,v 1.1 2005/06/14 00:58:01 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.86_rc1.ebuild,v 1.2 2005/06/18 20:35:18 ticho Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic fixheadtails
 
 MY_P=${P/_/}
 DESCRIPTION="Clam Anti-Virus Scanner"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/clamav/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt milter selinux"
+IUSE="crypt milter selinux mailwrapper"
 
 DEPEND="virtual/libc
 	crypt? ( >=dev-libs/gmp-4.1.2 )
@@ -52,8 +52,13 @@ src_compile() {
 	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 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
 }
@@ -109,9 +114,8 @@ pkg_postinst() {
 	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 "zless /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
+		einfo "For simple instructions how to setup the clamav-milter type:"
+		echo "  zless /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
 		echo
 	fi
 }