make sure the mailwrapper changes are in place.

5 files changed, 126 insertions, 10 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index 6d263a418659..e7b0b36eb1e1 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/nullmailer
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.1 2004/05/30 09:49:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.2 2004/05/31 00:21:57 robbat2 Exp $
+
+*nullmailer-1.00_rc7-r3 (30 May 2004)
+
+  30 May 2004; Robin H. Johnson <robbat2@gentoo.org>
+  nullmailer-1.00_rc7-r3.ebuild, files/mailer.conf:
+  make sure the mailwrapper changes are in place.
 
 *nullmailer-1.00_rc7-r2 (30 May 2004)
 
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 3a8d7445a2eb..839e5e32fc27 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -1,10 +1,12 @@
+MD5 57944a8f6edbcf87b5380f784ef932fe nullmailer-1.00_rc7-r2.ebuild 3530
+MD5 565be0dff22cde2ee55ff6f0d27ee6c0 nullmailer-1.00_rc7-r1.ebuild 3179
+MD5 92cdd186e92fc6de4d50b12258f5f79c nullmailer-1.00_rc7-r3.ebuild 3606
+MD5 4807995fb77ce1e36b672b6da612a269 ChangeLog 1930
+MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
+MD5 cbf00f49a102495e53091d9d35c0c1bf nullmailer-1.00_rc7.ebuild 3228
 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7 70
 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r1 70
-MD5 ccc26a349646e55860dc06066004ce63 files/remotes.sample 301
 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r2 70
-MD5 2f2133c808cfeded2c4b7b303e11a497 files/mailer.conf 924
-MD5 bbe96a8048806c7beaed78840603b551 ChangeLog 1438
-MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
-MD5 fab029d65c274f6139e6326b6f4d4acf nullmailer-1.00_rc7-r1.ebuild 3181
-MD5 21f45587295ae68ad05459ef1c8c90bd nullmailer-1.00_rc7.ebuild 3230
-MD5 c3db551a3c31dc694ffdd3e6936a4630 nullmailer-1.00_rc7-r2.ebuild 3532
+MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r3 70
+MD5 7e9737a515de7ff628184102fed62067 files/mailer.conf 1033
+MD5 ccc26a349646e55860dc06066004ce63 files/remotes.sample 301
diff --git a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r3 b/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r3
new file mode 100644
index 000000000000..d67f55c171d8
--- /dev/null
+++ b/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r3
@@ -0,0 +1 @@
+MD5 4a0bbe04ca8cf53987b7b1c27087aefe nullmailer-1.00RC7.tar.gz 115253
diff --git a/mail-mta/nullmailer/files/mailer.conf b/mail-mta/nullmailer/files/mailer.conf
index 28e387e637ff..346e41df4dee 100644
--- a/mail-mta/nullmailer/files/mailer.conf
+++ b/mail-mta/nullmailer/files/mailer.conf
@@ -2,8 +2,11 @@
 #
 # Execute the "real" sendmail program from nullmailer
 # named /usr/sbin/sendmail.nullmailer
-sendmail	/usr/sbin/sendmail.nullmailer
-mailq		/usr/bin/mailq.nullmailer
+sendmail        /usr/sbin/sendmail.nullmailer
+send-mail       /usr/sbin/sendmail.nullmailer
+mailq           /usr/bin/mailq.nullmailer
+newaliases      /usr/sbin/sendmail.nullmailer
+
 
 #
 # Execute the "real" sendmail program from postfix, 
diff --git a/mail-mta/nullmailer/nullmailer-1.00_rc7-r3.ebuild b/mail-mta/nullmailer/nullmailer-1.00_rc7-r3.ebuild
new file mode 100644
index 000000000000..9a6578c11d97
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-1.00_rc7-r3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.00_rc7-r3.ebuild,v 1.1 2004/05/31 00:21:57 robbat2 Exp $
+
+inherit eutils
+
+MY_P="${P/_rc/RC}"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Simple relay-only local mail transport agent"
+SRC_URI="http://untroubled.org/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://untroubled.org/${PN}/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+DEPEND="virtual/glibc
+		sys-apps/groff"
+RDEPEND="!virtual/mta
+		virtual/glibc
+		>=sys-apps/supervise-scripts-3.2
+		>=sys-apps/daemontools-0.76-r1
+		sys-apps/shadow"
+PROVIDE="virtual/mta"
+
+NULLMAILER_GROUP_NAME=nullmail
+NULLMAILER_GROUP_GID=88
+NULLMAILER_USER_NAME=nullmail
+NULLMAILER_USER_UID=88
+NULLMAILER_USER_SHELL=/bin/false
+NULLMAILER_USER_GROUPS=nullmail
+NULLMAILER_USER_HOME=/var/nullmailer
+
+setupuser() {
+	enewgroup ${NULLMAILER_GROUP_NAME} ${NULLMAILER_GROUP_GID}
+	enewuser ${NULLMAILER_USER_NAME} ${NULLMAILER_USER_UID} ${NULLMAILER_USER_SHELL} ${NULLMAILER_USER_HOME} ${NULLMAILER_USER_GROUPS}
+}
+
+pkg_setup() {
+	setupuser
+}
+
+src_compile() {
+	# Note that we pass a different directory below due to bugs in the makefile!
+	econf --localstatedir=/var || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	einstall localstatedir=${D}/var/nullmailer || die "einstall failed"
+	mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.nullmailer
+	mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.nullmailer
+	dodoc AUTHORS BUGS COPYING HOWTO INSTALL NEWS README YEAR2000 TODO ChangeLog
+	# A small bit of sample config
+	dodir /etc/nullmailer
+	insinto /etc/nullmailer
+	newins ${FILESDIR}/remotes.sample remotes
+	# daemontools stuff
+	dodir /var/nullmailer/service{,/log}
+	insinto /var/nullmailer/service/run
+	newins scripts/nullmailer.run run
+	fperms 700 /var/nullmailer/service/run
+	insinto /var/nullmailer/service/log
+	newins scripts/nullmailer-log.run run
+	fperms 700 /var/nullmailer/service/log/run
+	# usablity
+	dodir /usr/lib
+	dosym /usr/sbin/sendmail usr/lib/sendmail
+	# permissions stuff
+	keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue}
+	fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
+	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fowners nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
+	fperms 660 /var/nullmailer/trigger
+	ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf"
+	insinto /etc
+	doins ${FILESDIR}/mailer.conf
+}
+
+pkg_config() {
+	[ ! -s /etc/nullmailer/me ] && /bin/hostname --fqdn >/etc/nullmailer/me
+	[ ! -s /etc/nullmailer/defaultdomain ] && /bin/hostname --domain >/etc/nullmailer/defaultdomain
+	ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf"
+}
+
+pkg_postinst() {
+	setupuser
+	# Do this again for good measure
+	[ ! -e /var/nullmailer/trigger ] && mkfifo /var/nullmailer/trigger
+	chown nullmail:nullmail /var/log/nullmailer /var/nullmailer/{tmp,queue,trigger}
+	chmod 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
+	chmod 660 /var/nullmailer/trigger
+
+	TMP_P="${PN}-${PV}"
+	[ "${PR}" != "r0" ] && TMP_P="${TMP_P}-${PR}"
+	einfo "To create an initial setup, please do:"
+	einfo "ebuild /var/db/pkg/${CATEGORY}/${TMP_P}/${TMP_P}.ebuild config"
+	einfo "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file"
+	einfo "and create the following links :"
+	einfo "ln -fs /var/nullmailer/service /service/nullmailer"
+	ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf"
+}
+