add in urgent support for mailwrapper

5 files changed, 143 insertions, 6 deletions

diff --git a/net-mail/nullmailer/ChangeLog b/net-mail/nullmailer/ChangeLog
index 97358eedbe47..cf8fd8313e9e 100644
--- a/net-mail/nullmailer/ChangeLog
+++ b/net-mail/nullmailer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/nullmailer
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/nullmailer/ChangeLog,v 1.6 2003/11/06 20:12:13 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/nullmailer/ChangeLog,v 1.7 2004/04/19 19:27:41 robbat2 Exp $
+
+*nullmailer-1.00_rc7-r2 (19 Apr 2004)
+
+  19 Apr 2004; Robin H. Johnson <robbat2@gentoo.org>
+  nullmailer-1.00_rc7-r2.ebuild, files/mailer.conf:
+  add in urgent support for mailwrapper
 
   06 Nov 2003; Robin H. Johnson <robbat2@gentoo.org>
   nullmailer-1.00_rc7-r1.ebuild, nullmailer-1.00_rc7.ebuild:
diff --git a/net-mail/nullmailer/Manifest b/net-mail/nullmailer/Manifest
index 74b9333ef661..aece465e8a00 100644
--- a/net-mail/nullmailer/Manifest
+++ b/net-mail/nullmailer/Manifest
@@ -1,7 +1,10 @@
+MD5 72a711178fb738770858a2c323536210 nullmailer-1.00_rc7-r2.ebuild 3511
+MD5 5d1940b824f505e3fcb721788a3596a6 nullmailer-1.00_rc7-r1.ebuild 3163
+MD5 5497216beca99c581785df00c5607180 ChangeLog 1085
+MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
+MD5 816b161f1b0e4962d91fdf2e96d2942d nullmailer-1.00_rc7.ebuild 3212
 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7 70
 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r1 70
+MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r2 70
+MD5 2f2133c808cfeded2c4b7b303e11a497 files/mailer.conf 924
 MD5 ccc26a349646e55860dc06066004ce63 files/remotes.sample 301
-MD5 dceef8756b68295a57ec47fdc8579549 nullmailer-1.00_rc7-r1.ebuild 3164
-MD5 fdb0b615ab9329f94834941a3f40b358 ChangeLog 901
-MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
-MD5 ec129d92a438508c5e9e3086543178dc nullmailer-1.00_rc7.ebuild 3213
diff --git a/net-mail/nullmailer/files/digest-nullmailer-1.00_rc7-r2 b/net-mail/nullmailer/files/digest-nullmailer-1.00_rc7-r2
new file mode 100644
index 000000000000..d67f55c171d8
--- /dev/null
+++ b/net-mail/nullmailer/files/digest-nullmailer-1.00_rc7-r2
@@ -0,0 +1 @@
+MD5 4a0bbe04ca8cf53987b7b1c27087aefe nullmailer-1.00RC7.tar.gz 115253
diff --git a/net-mail/nullmailer/files/mailer.conf b/net-mail/nullmailer/files/mailer.conf
new file mode 100644
index 000000000000..28e387e637ff
--- /dev/null
+++ b/net-mail/nullmailer/files/mailer.conf
@@ -0,0 +1,30 @@
+#	$OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
+#
+# Execute the "real" sendmail program from nullmailer
+# named /usr/sbin/sendmail.nullmailer
+sendmail	/usr/sbin/sendmail.nullmailer
+mailq		/usr/bin/mailq.nullmailer
+
+#
+# Execute the "real" sendmail program from postfix, 
+# named /usr/sbin/sendmail.postfix
+#
+#sendmail	/usr/sbin/sendmail.postfix
+#send-mail	/usr/sbin/sendmail.postfix
+#mailq		/usr/sbin/sendmail.postfix
+#newaliases	/usr/sbin/sendmail.postfix
+
+# Execute the "real" sendmail program from ssmtp, 
+# named /usr/sbin/ssmtp
+#
+#sendmail	/usr/sbin/ssmtp
+#mailq		/usr/sbin/ssmtp
+#newaliases	/usr/sbin/ssmtp
+# Execute the "real" sendmail program, named /usr/sbin/sendmail
+#
+#sendmail	/usr/sbin/sendmail.sendmail
+#send-mail	/usr/sbin/sendmail.sendmail
+#mailq		/usr/sbin/sendmail.sendmail
+#newaliases	/usr/sbin/sendmail.sendmail
+#hoststat	/usr/sbin/sendmail.sendmail
+#purgestat	/usr/sbin/sendmail.sendmail
diff --git a/net-mail/nullmailer/nullmailer-1.00_rc7-r2.ebuild b/net-mail/nullmailer/nullmailer-1.00_rc7-r2.ebuild
new file mode 100644
index 000000000000..4a7686bff46b
--- /dev/null
+++ b/net-mail/nullmailer/nullmailer-1.00_rc7-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/nullmailer/nullmailer-1.00_rc7-r2.ebuild,v 1.1 2004/04/19 19:27:41 robbat2 Exp $
+
+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"
+
+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
+	cp ${FILESDIR}/remotes.sample ${D}/etc/nullmailer/remotes
+	# daemontools stuff
+	dodir /var/nullmailer/service{,/log}
+	cp scripts/nullmailer.run ${D}/var/nullmailer/service/run
+	fperms 700 /var/nullmailer/service/run
+	cp scripts/nullmailer-log.run ${D}/var/nullmailer/service/log/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"
+}
+
+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"
+}
+