Fixed a problem with dspam where the agent listed in quotes seemed to be mangled by configure somehow.

4 files changed, 32 insertions, 22 deletions

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 10122a8a5035..6dec91427b16 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.5 2004/07/21 07:01:47 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.6 2004/07/21 08:22:07 st_lim Exp $
+
+*dspam-3.1.0_beta11 (21 Jul 2004)
+
+  21 Jul 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.0.0.ebuild,
+  dspam-3.1.0_beta11.ebuild:
+  Fixed problem with myconf not taking the delivery-agent options seriously
 
   21 Jul 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.0.0.ebuild:
   Added information to use the user dspam
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 5b34eb80aaf8..d48f9f152f2e 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -1,6 +1,6 @@
-MD5 0e967de40184a561cbbb2a7558c21228 dspam-3.0.0.ebuild 6989
-MD5 f24a2ea845816670a771fc2b6265dd05 dspam-3.1.0_beta11.ebuild 7064
-MD5 ae58acce7f86931d739bc1a81623d3db ChangeLog 1295
+MD5 c3178fa7b418cac66b261a575043792b dspam-3.0.0.ebuild 6899
+MD5 ddd16af7c252e6af526b87faa25cac22 dspam-3.1.0_beta11.ebuild 6974
+MD5 5614ed0edb8858c73880dc1e1505abee ChangeLog 1504
 MD5 02610fe17122bb3a27ca3dcbf7374fcc metadata.xml 311
 MD5 2cd345708a9889a04c472a9e5be7400e files/untrusted.mailer_args 24
 MD5 2a79c945ef6c7e7bd45aa1d46ae99e69 files/mysql_install_db 114
diff --git a/mail-filter/dspam/dspam-3.0.0.ebuild b/mail-filter/dspam/dspam-3.0.0.ebuild
index ac3ee6aebb86..1472b37a999b 100644
--- a/mail-filter/dspam/dspam-3.0.0.ebuild
+++ b/mail-filter/dspam/dspam-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.0.0.ebuild,v 1.4 2004/07/21 07:01:47 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.0.0.ebuild,v 1.5 2004/07/21 08:22:07 st_lim Exp $
 
 inherit eutils
 
@@ -36,17 +36,18 @@ pkg_setup() {
 
 src_compile() {
 	local myconf
+	local agent
 
 	# these are the default settings
 	myconf="${myconf} --with-signature-life=14"
 	if use cyrus; then
-		myconf="${myconf} --with-delivery-agent='/usr/lib/cyrus/deliver \$u'"
+		agent="/usr/lib/cyrus/deliver %u"
 	elif use exim; then
-		myconf="${myconf} --with-delivery-agent='/usr/sbin/exim -oMr spam-scanned'"
+		agent="/usr/sbin/exim -oMr spam-scanned"
 	elif use maildrop; then
-		myconf="${myconf} --with-delivery-agent='/usr/bin/maildrop -d \$u'"
+		agent="/usr/bin/maildrop -d %u"
 	elif use procmail; then
-		myconf="${myconf} --with-delivery-agent=/usr/bin/procmail"
+		agent="/usr/bin/procmail"
 	fi
 	myconf="${myconf} --enable-homedir-dotfiles"
 	myconf="${myconf} --enable-spam-subject"
@@ -84,7 +85,8 @@ src_compile() {
 		myconf="${myconf} --with-db4-libraries=/usr/lib"
 	fi
 
-	econf ${myconf} || die
+	econf ${myconf} \
+		--with-delivery-agent="${agent}" || die
 	emake || die
 
 }
@@ -120,13 +122,13 @@ src_install () {
 	insopts -m0640 -o dspam -g dspam
 	doins ${FILESDIR}/trusted.users
 	if use cyrus; then
-		echo "/usr/lib/cyrus/deliver $u" > ${T}/untrusted.mailer_args
+		echo "/usr/lib/cyrus/deliver %u" > ${T}/untrusted.mailer_args
 	elif use exim; then
 		echo "/usr/sbin/exim -oMr spam-scanned" > ${T}/untrusted.mailer_args
 	elif use courier; then
-		echo "/usr/bin/maildrop -d $u" > ${T}/untrusted.mailer_args
+		echo "/usr/bin/maildrop -d %u" > ${T}/untrusted.mailer_args
 	elif use procmail; then
-		echo "/usr/bin/procmail -d $u" > ${T}/untrusted.mailer_args
+		echo "/usr/bin/procmail -d %u" > ${T}/untrusted.mailer_args
 	fi
 
 	# database related configuration and scripts
diff --git a/mail-filter/dspam/dspam-3.1.0_beta11.ebuild b/mail-filter/dspam/dspam-3.1.0_beta11.ebuild
index fa24134e0124..e9ab3f14ac3d 100644
--- a/mail-filter/dspam/dspam-3.1.0_beta11.ebuild
+++ b/mail-filter/dspam/dspam-3.1.0_beta11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.1.0_beta11.ebuild,v 1.1 2004/07/21 07:01:47 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.1.0_beta11.ebuild,v 1.2 2004/07/21 08:22:07 st_lim Exp $
 
 inherit eutils
 
@@ -38,17 +38,18 @@ pkg_setup() {
 
 src_compile() {
 	local myconf
+	local agent
 
 	# these are the default settings
 	myconf="${myconf} --with-signature-life=14"
 	if use cyrus; then
-		myconf="${myconf} --with-delivery-agent='/usr/lib/cyrus/deliver \$u'"
+		agent="/usr/lib/cyrus/deliver %u"
 	elif use exim; then
-		myconf="${myconf} --with-delivery-agent='/usr/sbin/exim -oMr spam-scanned'"
+		agent="/usr/sbin/exim -oMr spam-scanned"
 	elif use maildrop; then
-		myconf="${myconf} --with-delivery-agent='/usr/bin/maildrop -d \$u'"
+		agent="/usr/bin/maildrop -d %u"
 	elif use procmail; then
-		myconf="${myconf} --with-delivery-agent=/usr/bin/procmail"
+		agent="/usr/bin/procmail"
 	fi
 	myconf="${myconf} --enable-homedir-dotfiles"
 	myconf="${myconf} --enable-spam-subject"
@@ -86,7 +87,8 @@ src_compile() {
 		myconf="${myconf} --with-db4-libraries=/usr/lib"
 	fi
 
-	econf ${myconf} || die
+	econf ${myconf} \
+		--with-delivery-agent="${agent}" || die
 	emake || die
 
 }
@@ -122,13 +124,13 @@ src_install () {
 	insopts -m0640 -o dspam -g dspam
 	doins ${FILESDIR}/trusted.users
 	if use cyrus; then
-		echo "/usr/lib/cyrus/deliver $u" > ${T}/untrusted.mailer_args
+		echo "/usr/lib/cyrus/deliver %u" > ${T}/untrusted.mailer_args
 	elif use exim; then
 		echo "/usr/sbin/exim -oMr spam-scanned" > ${T}/untrusted.mailer_args
 	elif use courier; then
-		echo "/usr/bin/maildrop -d $u" > ${T}/untrusted.mailer_args
+		echo "/usr/bin/maildrop -d %u" > ${T}/untrusted.mailer_args
 	elif use procmail; then
-		echo "/usr/bin/procmail -d $u" > ${T}/untrusted.mailer_args
+		echo "/usr/bin/procmail -d %u" > ${T}/untrusted.mailer_args
 	fi
 
 	# database related configuration and scripts