Fix bug #95292 for mailwrapper sandbox violation.

Package-Manager: portage-2.0.53_rc7

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index 1e820bdb515fcc95205471ba7d689088af5cbba0..d53eed80b083bf591261b9596e11f30f8a8d251e 100644 (file)
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-mta/nullmailer
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.14 2005/06/02 04:58:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.15 2005/11/29 20:19:29 robbat2 Exp $
+
+  29 Nov 2005; Robin H. Johnson <robbat2@gentoo.org> nullmailer-1.00.ebuild:
+  Fix bug #95292 for mailwrapper sandbox violation.
 
 *nullmailer-1.00 (02 Jun 2005)
 

diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index ce2a5e29cecfc878e4eb23078b5d72b2118ae3ea..9305dabd78a0707d6078797a3c1d46b886e21cf1 100644 (file)
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7713fe393545d72d5ccd8608226f62c1 ChangeLog 4108
+MD5 b70fa03f33497b6e63498966e7880a7e ChangeLog 4238
 MD5 c367e5657509b68e227ffa43f954a211 files/digest-nullmailer-1.00 67
 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7 70
 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r1 70
@@ -14,16 +11,9 @@ MD5 a8919e8c159a7204d3d17f018d5415ce files/nullmailer-1.00-smtp-auth.patch 3990
 MD5 a01ca848067aabbcb80c249f08c764eb files/nullmailer-1.00-syslog.patch 10047
 MD5 6d7b320c8d40ac0e2b4daca84d975cba files/remotes.sample 444
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
-MD5 5d859342b9a7e38ea0b597d497ffadb0 nullmailer-1.00.ebuild 4046
+MD5 ca585ad7847cae45ba2dd0d400c6c391 nullmailer-1.00.ebuild 4064
 MD5 107dfa3e234efb28793e20c0577f5040 nullmailer-1.00_rc7-r1.ebuild 3109
 MD5 4a4fab3e4c0d1071f7b6ac74435e39a6 nullmailer-1.00_rc7-r2.ebuild 3460
 MD5 d6d59dec1d46bd3c4e2f6e4a95eb4411 nullmailer-1.00_rc7-r4.ebuild 3757
 MD5 81b2820bc4870c2e0a79c1b6e921fada nullmailer-1.00_rc7-r5.ebuild 4342
 MD5 642af279edee12aa1db84cea59fcc7a3 nullmailer-1.00_rc7.ebuild 3158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzz4zI1lqEGTUzyQRAmu0AKDc3yxirsqZhq9jNUEywZiaaaL/2ACdHYzs
-uXC6ytJ2YV8nLDQ9z06OTm8=
-=AmCP
------END PGP SIGNATURE-----

diff --git a/mail-mta/nullmailer/nullmailer-1.00.ebuild b/mail-mta/nullmailer/nullmailer-1.00.ebuild
index 35b15402246e8b9c7a9e26271ec930331003e05d..dbc237a4f1bc0203795611b2135972dc6881b242 100644 (file)
--- a/mail-mta/nullmailer/nullmailer-1.00.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.00.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/mail-mta/nullmailer/nullmailer-1.00.ebuild,v 1.2 2005/07/09 03:01:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.00.ebuild,v 1.3 2005/11/29 20:19:29 robbat2 Exp $
 
 inherit eutils flag-o-matic
 
@@ -65,7 +65,6 @@ src_install () {
        if use mailwrapper; then
                mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.nullmailer
                mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.nullmailer
-               dosym /usr/sbin/sendmail /usr/bin/mailq
                insinto /etc/mail
                doins ${FILESDIR}/mailer.conf
        fi
@@ -120,6 +119,8 @@ pkg_postinst() {
        chmod 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
        chmod 660 /var/nullmailer/trigger
 
+       use mailwrapper && dosym /usr/sbin/sendmail /usr/bin/mailq
+
        einfo "To create an initial setup, please do:"
        einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
        msg_svscan