Fix issues from bug #135005.

Package-Manager: portage-2.1.1_pre2-r6

4 files changed, 35 insertions, 26 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 04a894dda3cd..3ced55710709 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/courier
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.71 2006/07/12 04:38:42 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.72 2006/07/14 17:11:38 chtekk Exp $
+
+  14 Jul 2006; Luca Longinotti <chtekk@gentoo.org> files/mailer.conf,
+  courier-0.53.2.ebuild:
+  Fix bug in src_test and correct mailer.conf, thanks to Jason Wever on bug
+  #135005.
 
   12 Jul 2006; Joshua Jackson <tsunam@gentoo.org> courier-0.52.2.ebuild:
   Stable x86; security bug #135005
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index a6b3ca75b2f6..4b47397e73b0 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX apache-sqwebmail.inc 347 RMD160 9d046149af6138320448fe7bb762b142e0eb9b94 SHA1 4996c33b74a3c9b70886f27948334e3880df8073 SHA256 3a6616dacfd49ab0c89c62d9df5662fc3c2d9e598786d781240bf5e8900afc65
 MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
 RMD160 9d046149af6138320448fe7bb762b142e0eb9b94 files/apache-sqwebmail.inc 347
@@ -29,10 +26,10 @@ AUX locallowercase 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3
 MD5 d41d8cd98f00b204e9800998ecf8427e files/locallowercase 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/locallowercase 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/locallowercase 0
-AUX mailer.conf 199 RMD160 2f5cd1e2e983d32dd78d59ef4e359b9c9f4933f3 SHA1 7d9bafd987e89b5d2d49ee6a0f781636326c8edc SHA256 a80ff48cf867d4a0cad3a6e2e33299375dc31f2033edaaaff0f87ee7c52edb2a
-MD5 9bd0825e1ea931d82349ec13d74df657 files/mailer.conf 199
-RMD160 2f5cd1e2e983d32dd78d59ef4e359b9c9f4933f3 files/mailer.conf 199
-SHA256 a80ff48cf867d4a0cad3a6e2e33299375dc31f2033edaaaff0f87ee7c52edb2a files/mailer.conf 199
+AUX mailer.conf 197 RMD160 4229dfa9cf33b275571538211dad33da5ae84048 SHA1 caf095797e8c526dc5fec59d9d89d51f318cd28a SHA256 5a946a7c4ed42bbddf2c471e2e00898150e4bff33f4af70620cf814ab2f12b47
+MD5 04a07dbdb1ff940e362d57457e013299 files/mailer.conf 197
+RMD160 4229dfa9cf33b275571538211dad33da5ae84048 files/mailer.conf 197
+SHA256 5a946a7c4ed42bbddf2c471e2e00898150e4bff33f4af70620cf814ab2f12b47 files/mailer.conf 197
 AUX norewrite.patch 489 RMD160 1d0bacf702126cc4f8b9d7b07bbc6a9357b7b6e9 SHA1 007059af9ab5d89b36004e590b6a21911515f69b SHA256 526f3742fb43af93811e6e4b3210fda1c611b50ce5abdf3a57a25dfe4f5c38e4
 MD5 098e16e61446aceb242735b1ca70509a files/norewrite.patch 489
 RMD160 1d0bacf702126cc4f8b9d7b07bbc6a9357b7b6e9 files/norewrite.patch 489
@@ -89,14 +86,14 @@ EBUILD courier-0.52.2.ebuild 11494 RMD160 4fba5308efce086e4df6dbbc39cfda9c99af1e
 MD5 0519ed44025abe0305fa3148830253e2 courier-0.52.2.ebuild 11494
 RMD160 4fba5308efce086e4df6dbbc39cfda9c99af1e95 courier-0.52.2.ebuild 11494
 SHA256 bb0929bc9afd87e68f24ecdd61b102e3867545aa6e25f03b901cc8d204dc6a76 courier-0.52.2.ebuild 11494
-EBUILD courier-0.53.2.ebuild 11523 RMD160 fdb244801c01041b03856fac946a900f174eed8d SHA1 d43e3aed761d51a1bd82334c39dfa0b5be18785a SHA256 80199bd66c1fc2036396723ff8647074ad0b82598c703f4105207b3c09282c0c
-MD5 fafb5ce5b4ebacb19c9fdb4b8822f4ed courier-0.53.2.ebuild 11523
-RMD160 fdb244801c01041b03856fac946a900f174eed8d courier-0.53.2.ebuild 11523
-SHA256 80199bd66c1fc2036396723ff8647074ad0b82598c703f4105207b3c09282c0c courier-0.53.2.ebuild 11523
-MISC ChangeLog 22568 RMD160 b126a54648e101fe77c350606c11db6ce61384e0 SHA1 61ddfb530f57b43d267de6ffb96804de3a59c4d5 SHA256 da4f74e784b33769b57556818d97bdffe3667bf34e8ee1b6f30a552765738560
-MD5 3e69d31a65b6b3a0da48928d031accaf ChangeLog 22568
-RMD160 b126a54648e101fe77c350606c11db6ce61384e0 ChangeLog 22568
-SHA256 da4f74e784b33769b57556818d97bdffe3667bf34e8ee1b6f30a552765738560 ChangeLog 22568
+EBUILD courier-0.53.2.ebuild 11963 RMD160 2822f6c1f8e200899bd683177092f49c80574df2 SHA1 09b745b2d7aa5ddd78c926b5284c60c1a8da83d1 SHA256 f79cf570b27310a41b5077cf9acf3fe48f7a8e466c94a773e5b2ed2c31ef1cfa
+MD5 f3e26cd12c4bd9c392813ccce5e18754 courier-0.53.2.ebuild 11963
+RMD160 2822f6c1f8e200899bd683177092f49c80574df2 courier-0.53.2.ebuild 11963
+SHA256 f79cf570b27310a41b5077cf9acf3fe48f7a8e466c94a773e5b2ed2c31ef1cfa courier-0.53.2.ebuild 11963
+MISC ChangeLog 22751 RMD160 3078e7413db038571570cc59302359a80e769739 SHA1 f77d553c6fd6aed9b74a8bc40216abe5f97b3258 SHA256 e144863e87df420b6bab1833fba2067a26c9f95d71b642c1a29b59dfd3effc89
+MD5 6f13045f1c13b0ad6000a05270a9bf86 ChangeLog 22751
+RMD160 3078e7413db038571570cc59302359a80e769739 ChangeLog 22751
+SHA256 e144863e87df420b6bab1833fba2067a26c9f95d71b642c1a29b59dfd3effc89 ChangeLog 22751
 MISC metadata.xml 392 RMD160 a5f3cd47c53ec2ae720e7e64edd0901125ff4ffc SHA1 614bb48a136a130cd478da768add34dfe83cd7f8 SHA256 3be70bc6ad3e8e0a58245206224523d8c97e9f0049423b057614c01c77bd36a5
 MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
 RMD160 a5f3cd47c53ec2ae720e7e64edd0901125ff4ffc metadata.xml 392
@@ -131,10 +128,3 @@ SHA256 573391f6b56d6110c9657041b69ef686dc5463e1a3f312442855c5230c606540 files/di
 MD5 18161922435984d1b48bfd5ef77528c7 files/digest-courier-0.53.2 250
 RMD160 105e1e4d06100267d18e5966e8b703422620d0e7 files/digest-courier-0.53.2 250
 SHA256 5536a2aa5dbdcf92f70d35abef705c52cdfb4e55dea28c3be5fcfae1b5297d41 files/digest-courier-0.53.2 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEtHz42ZWR0Jhg/EsRAkJYAJ9cdE8FO5migAtJEllWpHXC/ftVZACfTbwH
-9sfUuRfplEGBqfKnXZXxJ/k=
-=NXBq
------END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.53.2.ebuild b/mail-mta/courier/courier-0.53.2.ebuild
index f868625d35c7..25cb1dc49f3e 100644
--- a/mail-mta/courier/courier-0.53.2.ebuild
+++ b/mail-mta/courier/courier-0.53.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.53.2.ebuild,v 1.1 2006/07/11 00:21:53 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.53.2.ebuild,v 1.2 2006/07/14 17:11:38 chtekk Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -265,6 +265,20 @@ src_install() {
 	fi
 }
 
+src_test() {
+	addpredict /
+	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	if hasq userpriv ${FEATURES} ; then
+		if ! emake -j1 check; then
+			hasq test ${FEATURES} && die "Make check failed. See above for details."
+			hasq test ${FEATURES} || eerror "Make check failed. See above for details."
+		fi
+	else
+		hasq test ${FEATURES} && eerror "Make check needs FEATURES="userpriv" to work."
+	fi
+	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
+}
+
 pkg_postinst() {
 	use fam && einfo "fam daemon is needed for courier-imapd" \
 		|| ewarn "courier was built without fam support"
diff --git a/mail-mta/courier/files/mailer.conf b/mail-mta/courier/files/mailer.conf
index bb1f3eee8251..a97cbf6ce63e 100644
--- a/mail-mta/courier/files/mailer.conf
+++ b/mail-mta/courier/files/mailer.conf
@@ -1,6 +1,6 @@
 # Execute the "real" sendmail program, named /usr/sbin/sendmail
 #
-sendmail	/usr/sbin/sendmail.courier
-send-mail	/usr/sbin/sendmail.courier
+sendmail	/usr/bin/sendmail.courier
+send-mail	/usr/bin/sendmail.courier
 mailq		/usr/bin/mailq.courier
 rmail		/usr/bin/rmail.courier