minor permissions bug fix and move to stable

3 files changed, 95 insertions, 2 deletions

diff --git a/net-mail/nullmailer/Manifest b/net-mail/nullmailer/Manifest
index 6fcfd135feae..3199b85ae8e4 100644
--- a/net-mail/nullmailer/Manifest
+++ b/net-mail/nullmailer/Manifest
@@ -1,5 +1,5 @@
-MD5 c090183b4b3e6f1b160dd74637c2c796 nullmailer-1.00_rc7-r1.ebuild 3162
-MD5 bb7b7d2978397337a322e5b8d9ccdbf1 ChangeLog 672
+MD5 f23d5210c2538cf7b32a30e4af80fe5f nullmailer-1.00_rc7-r1.ebuild 3165
+MD5 6bd5a9de3bdba8355313571f6d03e4a7 ChangeLog 672
 MD5 d4b778258bd8c21f2966caf898e42e1a nullmailer-1.00_rc7.ebuild 3214
 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7 70
 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r1 70
diff --git a/net-mail/nullmailer/files/digest-nullmailer-1.00_rc7-r1 b/net-mail/nullmailer/files/digest-nullmailer-1.00_rc7-r1
new file mode 100644
index 000000000000..d67f55c171d8
--- /dev/null
+++ b/net-mail/nullmailer/files/digest-nullmailer-1.00_rc7-r1
@@ -0,0 +1 @@
+MD5 4a0bbe04ca8cf53987b7b1c27087aefe nullmailer-1.00RC7.tar.gz 115253
diff --git a/net-mail/nullmailer/nullmailer-1.00_rc7-r1.ebuild b/net-mail/nullmailer/nullmailer-1.00_rc7-r1.ebuild
new file mode 100644
index 000000000000..27e4b07c589d
--- /dev/null
+++ b/net-mail/nullmailer/nullmailer-1.00_rc7-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2003 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-r1.ebuild,v 1.1 2003/08/06 07:15:36 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"
+	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
+}
+
+pkg_config() {
+	[ ! -s /etc/nullmailer/me ] && /bin/hostname --fqdn >/etc/nullmailer/me
+	[ ! -s /etc/nullmailer/defaultdomain ] && /bin/hostname --domain >/etc/nullmailer/defaultdomain
+}
+
+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"
+}
+