Fix libmilter check for 64bit systems and mention libmilter package as another option to milter-enabled sendmail in the ewarn message. Bug #209679, by <ohnobinki at ohnopublishing homelinux net>. Fix quoting.

Package-Manager: portage-2.1.4.3

5 files changed, 35 insertions, 20 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index e6561aadec21..fb815a3540de 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.271 2008/02/11 13:57:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.272 2008/02/11 22:58:32 ticho Exp $
+
+  11 Feb 2008; Andrej Kacian <ticho@gentoo.org> clamav-0.91.2.ebuild,
+  clamav-0.91.2-r1.ebuild, clamav-0.92.ebuild:
+  Fix libmilter check for 64bit systems and mention libmilter package as
+  another option to milter-enabled sendmail in the ewarn message. Bug #209679,
+  by <ohnobinki at ohnopublishing homelinux net>. Fix quoting.
 
   11 Feb 2008; Raúl Porcel <armin76@gentoo.org> clamav-0.92.ebuild:
   alpha/ia64 stable wrt #207231
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 1cdc147be20a..d05970a4d776 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -9,8 +12,15 @@ AUX clamd.conf 193 RMD160 abebb5e1607e6819859b51e1a41b583c8266c6df SHA1 5b27737a
 AUX clamd.rc 3565 RMD160 704da4f51a69f01524ca68ebe379736c9b0597ce SHA1 d087a49aa492e46e059ddde8b70dc7df8e19d020 SHA256 50ca2c25f796bb3554b5aa08f9e1bbe043ced62f58f2295f6cf33403d7c23dd8
 DIST clamav-0.91.2.tar.gz 13394538 RMD160 9e181a7a4fd08377ff47663aed27f8cc97249a21 SHA1 f18007c3045a1d78967adad805c6934d46ca6419 SHA256 dac9de86dff5ef4c9a6e4962da24988e1aa74948a21b7fb7b7fed17867ddf2a0
 DIST clamav-0.92.tar.gz 14300798 RMD160 37f0450b9b3c6fc863f94811ae372ece1677d791 SHA1 b6573acd9a7bb6bf3bd4b39a0102ce0be764c5bc SHA256 d3c8c1e2e0025a354663b330d69c8848c7a5c9d7248204c69362c2924366025e
-EBUILD clamav-0.91.2-r1.ebuild 4379 RMD160 ed38aa0129f439cb6c0229e9e1c4063aab1d60c9 SHA1 0f4a7e46acc57ad476868cc0547873547e506333 SHA256 d86f4974dc3d94fc2493fa50f5147d56b9dc7d2da1037a0882fbfc1f2ecc9c30
-EBUILD clamav-0.91.2.ebuild 4236 RMD160 a6ac8480ebb4bf4707a859ef05f405d008ec62d9 SHA1 f2ca9d86c993d5fba4743b71a4364dc9a5907fcb SHA256 80d183b466341739dcec4a8c8ca3f430af6227878c5e9d400c669c6981d27c58
-EBUILD clamav-0.92.ebuild 4237 RMD160 9405a1ba3299372f289bcd08828dd40d2f266e0b SHA1 91dbff57689db072bc0977efc1834257aa3e9c2a SHA256 2e0b13b633e286b7c702433a7fca82230fe0084845a96f126a52098c6ff7f249
-MISC ChangeLog 41290 RMD160 99a231056e8b727d96429d4556fff89c58342b17 SHA1 a2af9a052bde836a1fc3812359683f68e2d5fc51 SHA256 88ee80c2676dadeae25a003c51f5f9c434beeb02fa9d57bfa7b40aaf6adaa843
+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
+EBUILD clamav-0.92.ebuild 4112 RMD160 0a0a7c1856901284375490a869d630237dbeade1 SHA1 60fe07671d3f7c681a1ac578ec17aabc64308dd1 SHA256 5c244a874c3f82121235e6422b0768dd9c3b515051addd1828c55beacf3cf1bc
+MISC ChangeLog 41621 RMD160 932474a36558b2607d069b85806c55769bd89fe0 SHA1 1b7972f1a52bbf4ee61ead89fe4391f87357af1f SHA256 a31945c9327522592da2bbd44ddd9a62eb6676fa406a6637942ca6f1f89378b9
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHsNMhQlM6RnzZP+IRAiwWAKCE9yazEAvsrQK7VuMMbGZPWLukiACfRkt1
+B/3qXQfK9okWlxStiTOo2WE=
+=gVPM
+-----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.91.2-r1.ebuild b/app-antivirus/clamav/clamav-0.91.2-r1.ebuild
index 0bc4b73c3a7d..adab121e5af5 100644
--- a/app-antivirus/clamav/clamav-0.91.2-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.91.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.91.2-r1.ebuild,v 1.7 2007/12/26 15:51:23 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.91.2-r1.ebuild,v 1.8 2008/02/11 22:58:32 ticho Exp $
 
 inherit autotools eutils flag-o-matic fixheadtails
 
@@ -40,7 +40,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.90-compat.patch
 	epatch "${FILESDIR}"/${PN}-0.90-nls.patch
diff --git a/app-antivirus/clamav/clamav-0.91.2.ebuild b/app-antivirus/clamav/clamav-0.91.2.ebuild
index 0aad2538f0c9..5bbb6455970b 100644
--- a/app-antivirus/clamav/clamav-0.91.2.ebuild
+++ b/app-antivirus/clamav/clamav-0.91.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.91.2.ebuild,v 1.9 2007/11/14 19:25:05 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.91.2.ebuild,v 1.10 2008/02/11 22:58:32 ticho Exp $
 
 inherit autotools eutils flag-o-matic fixheadtails
 
@@ -40,7 +40,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.90-compat.patch
 	epatch "${FILESDIR}"/${PN}-0.90-nls.patch
diff --git a/app-antivirus/clamav/clamav-0.92.ebuild b/app-antivirus/clamav/clamav-0.92.ebuild
index 87ccd41ddced..b2df835088d5 100644
--- a/app-antivirus/clamav/clamav-0.92.ebuild
+++ b/app-antivirus/clamav/clamav-0.92.ebuild
@@ -1,8 +1,8 @@
 # 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.92.ebuild,v 1.7 2008/02/11 13:57:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.92.ebuild,v 1.8 2008/02/11 22:58:32 ticho Exp $
 
-inherit autotools eutils flag-o-matic fixheadtails
+inherit autotools eutils flag-o-matic fixheadtails multilib
 
 DESCRIPTION="Clam Anti-Virus Scanner"
 HOMEPAGE="http://www.clamav.net/"
@@ -28,19 +28,18 @@ PROVIDE="virtual/antivirus"
 
 pkg_setup() {
 	if use milter; then
-		if [ ! -e /usr/lib/libmilter.a ] ; 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. 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"
+			ewarn "USE flag, or mail-filter/libmilter package."
 		fi
 	fi
+
 	enewgroup clamav
 	enewuser clamav -1 -1 /dev/null clamav
 }
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.90-compat.patch
 	epatch "${FILESDIR}"/${PN}-0.90-nls.patch
@@ -130,10 +129,10 @@ pkg_postinst() {
 	ewarn "Warning: clamd and/or freshclam have not been restarted."
 	ewarn "You should restart them to start using new version: /etc/init.d/clamd restart"
 	echo
-	ewarn "The soname for libclamav has changed after clamav-0.90."
+	ewarn "The soname for libclamav has changed in clamav-0.92."
 	ewarn "If you have upgraded from that or earlier version, it is recommended to run:"
 	ewarn
-	ewarn "revdep-rebuild --library libclamav.so.1"
+	ewarn "revdep-rebuild --library libclamav.so.2"
 	ewarn
 	ewarn "This will fix linking errors caused by this change."
 	echo