Fix milter stuff. Closes #83477.

Package-Manager: portage-2.0.51.16

3 files changed, 38 insertions, 14 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 29329375ca89..33c659b75639 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.51 2005/02/17 10:48:15 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.52 2005/02/27 23:21:30 ticho Exp $
+
+  27 Feb 2005; Andrej Kacian <ticho@gentoo.org> clamav-0.83.ebuild:
+  Fixed milter issue - added a conditional depend on mail-mta/sendmail, and a
+  check for milter USE flag being enabled for sendmail. Closes #83477,
+  reported by Drake Wyrm <bigwyrm@myrealbox.com>, who also suggested the fix.
 
   17 Feb 2005; Guy Martin <gmsoft@gentoo.org> clamav-0.82-r1.ebuild:
   Stable on hppa.
@@ -37,7 +42,7 @@
   06 Feb 2005; Markus Rothe <corsair@gentoo.org> clamav-0.80.ebuild:
   Stable on ppc64
 
-  30 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> clamav-0.81.ebuild:
+  30 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> clamav-0.81.ebuild:
   Stable on alpha, bug 78656.
 
   28 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> clamav-0.81.ebuild:
@@ -87,7 +92,7 @@
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
 
-  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> clamav-0.80.ebuild:
+  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> clamav-0.80.ebuild:
   ~alpha keyword.
 
   30 Nov 2004; Guy Martin <gmsoft@gentoo.org> clamav-0.80.ebuild:
@@ -197,7 +202,7 @@
   04 May 2004; Luca Barbato <lu_zero@gentoo.org> clamav-0.70.ebuild:
   Marked ppc
 
-  30 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> clamav-0.70.ebuild:
+  30 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> clamav-0.70.ebuild:
   Stable on alpha.
 
   29 Apr 2004; Jason Wever <weeve@gentoo.org> clamav-0.70.ebuild:
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 6b2a21e936ee..cf4bb35d2858 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,18 +1,28 @@
-MD5 b54731bd720bf11060c3cdbc0b1a3cd7 ChangeLog 11299
-MD5 4f620361b61c91340a4858f468d068d8 clamav-0.75.1.ebuild 1582
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 eaed8cd82387bcb8381091d3bd94e1d1 ChangeLog 11604
 MD5 9d62360a7a38f6147a6cfe97c777e035 clamav-0.80.ebuild 1790
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 MD5 263b0bccbdb202fcc734267a3086278c clamav-0.82-r1.ebuild 2074
 MD5 f3e0a0e2a0af48eb9d16fc66fdb6f78f clamav-0.81.ebuild 1963
 MD5 64d6a92024c638d9bbd9d4fd3b2fadf4 clamav-0.82.ebuild 1968
-MD5 43313da8a1880963363ce41ea8df4ad0 clamav-0.83.ebuild 1967
-MD5 ad7d45b1be51c06986cb42c53e733d19 files/clamav-milter.README.gentoo 1311
-MD5 e8dcbdecd955708ddc7c79399ffa6276 files/clamd.conf 166
+MD5 4f620361b61c91340a4858f468d068d8 clamav-0.75.1.ebuild 1582
+MD5 7b3cdc5a09231cb6bb98b186b941485a clamav-0.83.ebuild 2362
+MD5 21e06147c74a196e333ab2feafff5998 files/digest-clamav-0.82-r1 64
 MD5 1b3268d3723e003ad99bf706e6bf4312 files/clamd.rc 1444
+MD5 611be9042d6d7b2b1668df9d55b97c58 files/clamav-0.82-MS05-002-false-positive-fix.patch 626
+MD5 e8dcbdecd955708ddc7c79399ffa6276 files/clamd.conf 166
 MD5 f0090a77dc10ba3899900622336b8610 files/digest-clamav-0.75.1 66
-MD5 a42aa0e5135bd2ad22288e4150ec89e2 files/digest-clamav-0.80 64
-MD5 21e06147c74a196e333ab2feafff5998 files/digest-clamav-0.82 64
 MD5 90e45ae4932ab5efa4baa1936e016e10 files/digest-clamav-0.81 64
-MD5 611be9042d6d7b2b1668df9d55b97c58 files/clamav-0.82-MS05-002-false-positive-fix.patch 626
-MD5 21e06147c74a196e333ab2feafff5998 files/digest-clamav-0.82-r1 64
 MD5 9bbf2754f8178fd5164875d784aa9ffa files/digest-clamav-0.83 64
+MD5 21e06147c74a196e333ab2feafff5998 files/digest-clamav-0.82 64
+MD5 a42aa0e5135bd2ad22288e4150ec89e2 files/digest-clamav-0.80 64
+MD5 ad7d45b1be51c06986cb42c53e733d19 files/clamav-milter.README.gentoo 1311
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCIlYFQlM6RnzZP+IRAvZQAKCoSPsSZ96rdW/E5jop8HNmBB9f5QCfRe1h
+bLe7Lnx7BbYdfxcw9UmIve4=
+=wfm+
+-----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.83.ebuild b/app-antivirus/clamav/clamav-0.83.ebuild
index bd32441b2095..04583b1d2f08 100644
--- a/app-antivirus/clamav/clamav-0.83.ebuild
+++ b/app-antivirus/clamav/clamav-0.83.ebuild
@@ -1,6 +1,6 @@
 # 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.83.ebuild,v 1.1 2005/02/14 01:47:19 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.83.ebuild,v 1.2 2005/02/27 23:21:30 ticho Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,6 +15,7 @@ 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"
 RDEPEND="selinux? ( sec-policy/selinux-clamav )"
@@ -23,6 +24,14 @@ PROVIDE="virtual/antivirus"
 #S="${WORKDIR}/${P/_/}"
 
 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