Inform sandbox that configure process will try to touch clamd's database lock, so it doesn't error out. Bug #168716, reported by Yoann Pannier <gentoo-bugs at umsar.org>.

Package-Manager: portage-2.1.2.3

3 files changed, 36 insertions, 11 deletions

diff --git a/mail-filter/clamassassin/ChangeLog b/mail-filter/clamassassin/ChangeLog
index ec901fe5670e..81ed20746c85 100644
--- a/mail-filter/clamassassin/ChangeLog
+++ b/mail-filter/clamassassin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/clamassassin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/clamassassin/ChangeLog,v 1.22 2007/02/22 00:58:28 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/clamassassin/ChangeLog,v 1.23 2007/04/09 11:41:08 ticho Exp $
+
+  09 Apr 2007; Andrej Kacian <ticho@gentoo.org> clamassassin-1.2.3.ebuild:
+  Inform sandbox that configure process will try to touch clamd's database
+  lock, so it doesn't error out. Bug #168716, reported by Yoann Pannier
+  <gentoo-bugs at umsar.org>.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/mail-filter/clamassassin/Manifest b/mail-filter/clamassassin/Manifest
index 15ff0af5a37c..968181fc59b3 100644
--- a/mail-filter/clamassassin/Manifest
+++ b/mail-filter/clamassassin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST clamassassin-1.2.1.tar.gz 32039 RMD160 453ac861ccf5f1451c220640e18f38d2c72524fe SHA1 6e720983c2d22265cd68f418ac4e41f9580f2322 SHA256 6683bac828e3aa04df7b072f0bb86e6331c93bba692e4721022e3ae4f612d113
 DIST clamassassin-1.2.2.tar.gz 33748 RMD160 44191b7828ff5ecebd5e88660240a11b0a1097c1 SHA1 64b84d4b3d49308b7ac448e27062a6e72f1ffb6e SHA256 c466db7f130750aaf9378eb4b11b9b98d6eaac46cb609070abbb6106ef91f559
 DIST clamassassin-1.2.3.tar.gz 35605 RMD160 7ecbccaf8f3bd400fae85ad8839c822f9151d820 SHA1 883514caaafd064964f0c06b7ca9db44c0fd5249 SHA256 ea7650437c2efc3d08010c4033ec8c649238071d1bffa99a038245f6240d103b
@@ -9,14 +12,14 @@ EBUILD clamassassin-1.2.2.ebuild 945 RMD160 04f06aace663137922f0e1ff4278052ae67f
 MD5 d3c15b4f5b07c0ab69145d71c8e7f6b7 clamassassin-1.2.2.ebuild 945
 RMD160 04f06aace663137922f0e1ff4278052ae67fef59 clamassassin-1.2.2.ebuild 945
 SHA256 4b7c12e2b745573500b99c5dcb9282e3091b425cee0bcb7113bb21d247478ab7 clamassassin-1.2.2.ebuild 945
-EBUILD clamassassin-1.2.3.ebuild 942 RMD160 c3b6d0e3feb71cb3acad72d56d7df8da1a722650 SHA1 bfc14b5f9f94949000c2d27834bd8840ffc9d3b2 SHA256 85870b6684b72cbe1474bd4006147cef341bb1b037d5a1acd55a178467cd00ba
-MD5 24b812778668181aedc1b7ac63fb289a clamassassin-1.2.3.ebuild 942
-RMD160 c3b6d0e3feb71cb3acad72d56d7df8da1a722650 clamassassin-1.2.3.ebuild 942
-SHA256 85870b6684b72cbe1474bd4006147cef341bb1b037d5a1acd55a178467cd00ba clamassassin-1.2.3.ebuild 942
-MISC ChangeLog 3240 RMD160 b925a65c49e23477ba56575ff9858378344b7ae5 SHA1 fe59da2458e9e335d67f6c8525bee505a3f899dc SHA256 dad0a2ed28529984c11ef3e719684fabd3e7f6db5b3e87b8eece78bf76b033d2
-MD5 504ade68f39b1b1fea240f61eb2c6400 ChangeLog 3240
-RMD160 b925a65c49e23477ba56575ff9858378344b7ae5 ChangeLog 3240
-SHA256 dad0a2ed28529984c11ef3e719684fabd3e7f6db5b3e87b8eece78bf76b033d2 ChangeLog 3240
+EBUILD clamassassin-1.2.3.ebuild 1316 RMD160 fe2c0e1f015ec8c3f56c667710c4eddc657d31a1 SHA1 05f33b1103fd776489f2125dda369f8a88425673 SHA256 ffeb265bb80ed32c98e50ca41936fd073eb8611d44eaa61c1c5ea467928f606c
+MD5 b766dd71620ac287719834db8fcc28cb clamassassin-1.2.3.ebuild 1316
+RMD160 fe2c0e1f015ec8c3f56c667710c4eddc657d31a1 clamassassin-1.2.3.ebuild 1316
+SHA256 ffeb265bb80ed32c98e50ca41936fd073eb8611d44eaa61c1c5ea467928f606c clamassassin-1.2.3.ebuild 1316
+MISC ChangeLog 3493 RMD160 7fa1c359c5a37e96d47189344aa7290f959a971b SHA1 6d4d63ded4fecbf420fd1c339bd6668408846e84 SHA256 61ea97ed7236198d6fb8b649a12795e2d0c2396e19263a504fcbd62e1cfd0e32
+MD5 2f88d49127e554c2b00401851c599db4 ChangeLog 3493
+RMD160 7fa1c359c5a37e96d47189344aa7290f959a971b ChangeLog 3493
+SHA256 61ea97ed7236198d6fb8b649a12795e2d0c2396e19263a504fcbd62e1cfd0e32 ChangeLog 3493
 MISC metadata.xml 223 RMD160 6159fc77e34fb07b40293af1aec8fe3b56393a88 SHA1 40b6d7e81b32fc2b354f05b90c1df75d606459b2 SHA256 a12a05e718496d215f6c208639d3862f4a8471d6ff3131e29a75a2cdc0a9d6af
 MD5 8a1c6c5f4c13a4109f6f4198fdd1874b metadata.xml 223
 RMD160 6159fc77e34fb07b40293af1aec8fe3b56393a88 metadata.xml 223
@@ -30,3 +33,10 @@ SHA256 00c36a04dc0c3ff124feb62fbbab747220f3048112ef263ba1dfc4672829f9ab files/di
 MD5 e4204b650edf290bdedebda67759edaf files/digest-clamassassin-1.2.3 253
 RMD160 59098ee4de1feb1fffd6b6c2b29ede44bfbccc42 files/digest-clamassassin-1.2.3 253
 SHA256 c311dc061268ef92529e7de531747d122002c993f7510c2bb11fca6eff8cfcf8 files/digest-clamassassin-1.2.3 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGGiZaQlM6RnzZP+IRAscMAJ4itz2cslsJNSf7vzNCv1X1T0+p8wCfaIUo
+O+nn8Xgy1Z5MAGyDDqnwwas=
+=XiM1
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/clamassassin/clamassassin-1.2.3.ebuild b/mail-filter/clamassassin/clamassassin-1.2.3.ebuild
index e09bb342e95d..26b8c83c3d29 100644
--- a/mail-filter/clamassassin/clamassassin-1.2.3.ebuild
+++ b/mail-filter/clamassassin/clamassassin-1.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/clamassassin/clamassassin-1.2.3.ebuild,v 1.2 2006/03/13 14:22:42 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/clamassassin/clamassassin-1.2.3.ebuild,v 1.3 2007/04/09 11:41:08 ticho Exp $
 
 DESCRIPTION="clamassassin is a simple script for virus scanning (through clamav) an e-mail message as a
 filter (like spamassassin)"
@@ -16,6 +16,16 @@ DEPEND=">=app-antivirus/clamav-0.75.1
 		mail-filter/procmail"
 
 src_compile() {
+	# Try to get location of clamd's DatabaseDirectory
+	local clamav_dbdir=`awk '$1 == "DatabaseDirectory" { print $2 }' \
+		/etc/clamd.conf`
+	# If not defined in clamd.conf, go with default
+	if [ -z "$clamav_dbdir" ] ; then
+		clamav_dbdir="/var/lib/clamav"
+	fi
+	# Add an entry to sandbox write prediction list, so sandbox doesn't complain
+	addpredict ${clamav_dbdir}/.dbLock
+
 	econf \
 		$(use_enable subject-rewrite) \
 		$(use_enable clamd clamdscan) \