new version, includes debian fixes.

4 files changed, 142 insertions, 14 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index 18e8771a45b7..117395f6c28f 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/nullmailer
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.6 2004/07/17 21:37:51 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.7 2004/11/16 09:24:33 robbat2 Exp $
+
+*nullmailer-1.00_rc7-r5 (16 Nov 2004)
+
+  16 Nov 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +nullmailer-1.00_rc7-r5.ebuild:
+  new version, includes debian fixes.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   nullmailer-1.00_rc7-r1.ebuild, nullmailer-1.00_rc7-r2.ebuild,
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 08b3b6cad02f..78f4ece14a90 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c97a6fed3d9a2f9173500744cea5a220 ChangeLog 2470
-MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
-MD5 b274ea3b885ad9f09ed233b9984765d9 nullmailer-1.00_rc7-r1.ebuild 3177
 MD5 6db6524a9dc45c93259644fab749dbf0 nullmailer-1.00_rc7-r2.ebuild 3528
 MD5 456f3b517222cb4da5136872de1246e7 nullmailer-1.00_rc7-r4.ebuild 3825
+MD5 b274ea3b885ad9f09ed233b9984765d9 nullmailer-1.00_rc7-r1.ebuild 3177
+MD5 c97a6fed3d9a2f9173500744cea5a220 ChangeLog 2470
+MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
 MD5 15ba1ee17b414a2a084652e76f513b3c nullmailer-1.00_rc7.ebuild 3226
+MD5 8e9a3f6363baca8a3e02cd51fa6572b2 nullmailer-1.00_rc7-r5.ebuild 4325
 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 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r4 70
+MD5 639fa6e9d323b500b247ab367596cb29 files/digest-nullmailer-1.00_rc7-r5 143
+MD5 f84872ff5173e65cc492a42451c74926 files/nullmailer-1.00-rc7-debian22.patch 13992
 MD5 4a2517a7b69e06ec8f1dcc634f1f9f28 files/mailer.conf 1588
 MD5 ccc26a349646e55860dc06066004ce63 files/remotes.sample 301
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA+e+DmdTrptrqvGERAmZWAJ9WvF3L7EkiDiHDXiAJXiYi20n3nQCeJ64d
-vNxx81gaPzQ5/o9zJNUHnaM=
-=lc+U
------END PGP SIGNATURE-----
diff --git a/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r5 b/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r5
new file mode 100644
index 000000000000..edf6986401b1
--- /dev/null
+++ b/mail-mta/nullmailer/files/digest-nullmailer-1.00_rc7-r5
@@ -0,0 +1,2 @@
+MD5 4a0bbe04ca8cf53987b7b1c27087aefe nullmailer-1.00RC7.tar.gz 115253
+MD5 6afd79fb3e644b2f89acafdea983e0d1 nullmailer_1.00RC7-22.diff.gz 17964
diff --git a/mail-mta/nullmailer/nullmailer-1.00_rc7-r5.ebuild b/mail-mta/nullmailer/nullmailer-1.00_rc7-r5.ebuild
new file mode 100644
index 000000000000..04740b3fc9c3
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-1.00_rc7-r5.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.00_rc7-r5.ebuild,v 1.1 2004/11/16 09:24:33 robbat2 Exp $
+
+inherit eutils
+
+MY_P="${P/_rc/RC}"
+S=${WORKDIR}/${MY_P}
+DEBIAN_PATCH="${MY_P/-/_}-22.diff.gz"
+DESCRIPTION="Simple relay-only local mail transport agent"
+SRC_URI="http://untroubled.org/${PN}/${MY_P}.tar.gz mirror://debian//pool/main/${PN:0:1}/${PN}/${DEBIAN_PATCH}"
+HOMEPAGE="http://untroubled.org/${PN}/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+IUSE="mailwrapper"
+
+DEPEND="virtual/libc
+		sys-apps/groff"
+RDEPEND="!mailwrapper? ( !virtual/mta )
+		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+		virtual/libc
+		>=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}
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	mkdir -p ${S}/debian
+	epatch ${DISTDIR}/${DEBIAN_PATCH} || die "debian patch failed"
+	local debianpatch
+	# we don't want 02*diff
+	for i in 01syslog.diff 03addrdot.diff 04pine.diff 05perm.diff 06g++.diff 07smtp.diff; do
+		debianpatch="${S}/debian/patches/${i}"
+		sed -e 's, (Debian only),,g' -i "${debianpatch}" || die "patch sed failed"
+		EPATCH_OPTS="-d ${S} -p1" epatch "${debianpatch}" || die "epatch failed"
+	done;
+}
+
+
+pkg_setup() {
+	setupuser
+}
+
+src_compile() {
+	append-ldflags -Wl,-z,now
+	# 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"
+	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
+	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
+	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
+	use mailwrapper && \
+		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
+	use mailwrapper && \
+		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 link :"
+	einfo "ln -fs /var/nullmailer/service /service/nullmailer"
+	use mailwrapper && \
+		ewarn "Please ensure you have selected nullmailer in your /etc/mailer.conf"
+}