Bug #112163 - Version bump. Bug #118043 - init.d script. Bug #118826 - ~amd64 keyword.

(Portage version: 2.1_pre4-r1)

6 files changed, 258 insertions, 13 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index 198bf02879f0..6130ad49f2a2 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2005/12/31 14:18:03 flameeyes Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.20 2006/01/30 03:50:33 robbat2 Exp $
+
+*nullmailer-1.02 (30 Jan 2006)
+
+  30 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/init.d-nullmailer, +nullmailer-1.02.ebuild:
+  Bug #112163 - Version bump. Bug #118043 - init.d script. Bug #118826 -
+  ~amd64 keyword.
 
   31 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   nullmailer-1.00_rc7.ebuild, nullmailer-1.00_rc7-r1.ebuild,
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 033bf63b33b0..655e6e33a6bd 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -1,29 +1,66 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2b769c517f32f6f63ec898da1649b026 ChangeLog 4899
-MD5 c367e5657509b68e227ffa43f954a211 files/digest-nullmailer-1.00 67
+RMD160 f5c9768643b770c1cfb17cf56601ae0892df3191 ChangeLog 4899
+SHA256 e9922a054ebc16f4cc48fad8df127d0a75b261e5d865500bb0c4bc76c4645cea ChangeLog 4899
+MD5 06a9baa1496bffaed64ef1891cbe1d13 files/digest-nullmailer-1.00 247
+RMD160 e472f735603df6e727cf722e00c7d325a1fcfa69 files/digest-nullmailer-1.00 247
+SHA256 d65c51d9ad82d8df49abd94224a889e9ffa2748dc7953574c9371bc2716f0378 files/digest-nullmailer-1.00 247
 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7 70
+RMD160 c9d5203905e7563c3b66d77b0d290dfa4e6750d1 files/digest-nullmailer-1.00_rc7 70
+SHA256 18e7d643406f4230c39b55f471fcdb5f411f616735ce150818e41cea306808b4 files/digest-nullmailer-1.00_rc7 70
 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r1 70
+RMD160 c9d5203905e7563c3b66d77b0d290dfa4e6750d1 files/digest-nullmailer-1.00_rc7-r1 70
+SHA256 18e7d643406f4230c39b55f471fcdb5f411f616735ce150818e41cea306808b4 files/digest-nullmailer-1.00_rc7-r1 70
 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r2 70
+RMD160 c9d5203905e7563c3b66d77b0d290dfa4e6750d1 files/digest-nullmailer-1.00_rc7-r2 70
+SHA256 18e7d643406f4230c39b55f471fcdb5f411f616735ce150818e41cea306808b4 files/digest-nullmailer-1.00_rc7-r2 70
 MD5 4fbcdae998661648262584be8be8b7df files/digest-nullmailer-1.00_rc7-r4 70
+RMD160 c9d5203905e7563c3b66d77b0d290dfa4e6750d1 files/digest-nullmailer-1.00_rc7-r4 70
+SHA256 18e7d643406f4230c39b55f471fcdb5f411f616735ce150818e41cea306808b4 files/digest-nullmailer-1.00_rc7-r4 70
 MD5 639fa6e9d323b500b247ab367596cb29 files/digest-nullmailer-1.00_rc7-r5 143
+RMD160 f79f83943ae4f04b3d665e4969130d58d6c8ce9c files/digest-nullmailer-1.00_rc7-r5 143
+SHA256 2caa6fb466387b3491bdbb3e7b9a98617200b04d4222244539ba2c9d76a0fdc1 files/digest-nullmailer-1.00_rc7-r5 143
+MD5 43920fd55d8bc46cbd5a9e49eb36571b files/digest-nullmailer-1.02 500
+RMD160 9709467371178f6b5d91a069679b62235837da0a files/digest-nullmailer-1.02 500
+SHA256 2210806664c8cb8c20146cff21be42c1f46ca311959019e19299f2c939db8ff6 files/digest-nullmailer-1.02 500
+MD5 f05b47802661d0701481b51ea30e3d66 files/init.d-nullmailer 1115
+RMD160 8ddba4f24d43fa6486cc0a88821f7c2185934e16 files/init.d-nullmailer 1115
+SHA256 826b4b7d541cec68b8f3f7b300591bb1e3ca729f78400e9447cc1bdb1955989f files/init.d-nullmailer 1115
 MD5 4a2517a7b69e06ec8f1dcc634f1f9f28 files/mailer.conf 1588
+RMD160 d97614351170338d47f7f852e3e8282882ea03a9 files/mailer.conf 1588
+SHA256 2a10a9f1b8086c4c3c0d49b4788895d9d70338d93dc87d738f10257b18fbff30 files/mailer.conf 1588
 MD5 8fec0281a21917aa07f71f32877486d6 files/nullmailer-1.00-gcc34-fix.patch 618
+RMD160 e294a7728b968b70e88f3882994c766eabd46e24 files/nullmailer-1.00-gcc34-fix.patch 618
+SHA256 41f25b50859cf391ca8f9f9163bd5ce05553b70acef4413930a85e6df6b61ddb files/nullmailer-1.00-gcc34-fix.patch 618
 MD5 a8919e8c159a7204d3d17f018d5415ce files/nullmailer-1.00-smtp-auth.patch 3990
+RMD160 a773a74362e49fe4ee72234cd0f1c8ecf845a642 files/nullmailer-1.00-smtp-auth.patch 3990
+SHA256 dac4fed444ebbdd6c372e918c86ab2d5046fdb66faf55c9efe485f4b768cdf1a files/nullmailer-1.00-smtp-auth.patch 3990
 MD5 a01ca848067aabbcb80c249f08c764eb files/nullmailer-1.00-syslog.patch 10047
+RMD160 c27eecec6a1f0e1017217d4baaa9dfe6a5d05206 files/nullmailer-1.00-syslog.patch 10047
+SHA256 c158e90fa9e16bf4d9f71cb0d92eb1f8223ad899862dcd939e67f6867f7abfb9 files/nullmailer-1.00-syslog.patch 10047
 MD5 6d7b320c8d40ac0e2b4daca84d975cba files/remotes.sample 444
+RMD160 00d2f8ccade03f6ba9cca2f3f0a157f42e3b8b98 files/remotes.sample 444
+SHA256 c3c6b0efc100142ecbe65b9af3e20900f9b21449619f35ef3ba2334dd0888b1f files/remotes.sample 444
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
+RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 metadata.xml 280
+SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540 metadata.xml 280
 MD5 d4e805efb1d3b2e50c998385b843eaf8 nullmailer-1.00.ebuild 4063
+RMD160 f0cae7caed44de2bcb8f7973c930797f0ecbd1f7 nullmailer-1.00.ebuild 4063
+SHA256 475d36030ac457fe80f07bb5f18d59047da0ceb29cbe8bf4159c8f38f6a986dd nullmailer-1.00.ebuild 4063
 MD5 0a3268172648b4e421507917392a5b4e nullmailer-1.00_rc7-r1.ebuild 3102
+RMD160 f9210a64271f26e4824a8ff2fb51c9cb03b1955c nullmailer-1.00_rc7-r1.ebuild 3102
+SHA256 7d29cb7de512ecf77b162cc375b90710f82b908bd51410dc21e6bd8bf1c4ce6a nullmailer-1.00_rc7-r1.ebuild 3102
 MD5 52ec79f027ce456d57c887779c9012f3 nullmailer-1.00_rc7-r2.ebuild 3453
+RMD160 206262a114c87bc4d004589c051e437c1a2afdec nullmailer-1.00_rc7-r2.ebuild 3453
+SHA256 b9b0379e03d3ef6577a8156bfa07833f49990714192fe792684c75748788f112 nullmailer-1.00_rc7-r2.ebuild 3453
 MD5 0b62f146f078fb8ca6c3882cf7beacd8 nullmailer-1.00_rc7-r4.ebuild 3750
+RMD160 3255eede14626bca6b2a4452e7337117b54244ac nullmailer-1.00_rc7-r4.ebuild 3750
+SHA256 25b6bceab6932c9e00643847975ff46b87f5252e1c0987b368ead9888d5e0ca9 nullmailer-1.00_rc7-r4.ebuild 3750
 MD5 8006d00f06f72fcfeb67b8a7c9fa8616 nullmailer-1.00_rc7-r5.ebuild 4354
+RMD160 1e659965919b72dbc5b8b56d9568d58917b88b65 nullmailer-1.00_rc7-r5.ebuild 4354
+SHA256 41530d9a224243ba3adc1ea68333b3994a69873510f7ca2af1f31d24ed5c07fd nullmailer-1.00_rc7-r5.ebuild 4354
 MD5 924e99d087a6b09c6dca72afeccf5eca nullmailer-1.00_rc7.ebuild 3151
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDtpMnAiZjviIA2XgRAue5AJ0eR3SivGGkUyRtdgpAajdKtzq+AACg70EL
-UGgcCFz/Yh+N1OH7xqfKs20=
-=hkpF
------END PGP SIGNATURE-----
+RMD160 e783ce992092881caff7b2c8711f64ef2c4edf51 nullmailer-1.00_rc7.ebuild 3151
+SHA256 483215a2423d949d522c6c73f984413950bb16679ac962cb6f9f0f2f155585a8 nullmailer-1.00_rc7.ebuild 3151
+MD5 95ae139344da586f641dc23ad2587f17 nullmailer-1.02.ebuild 4697
+RMD160 949e0c77d3eb3f9cd247a2c6412bbb546bc7d72c nullmailer-1.02.ebuild 4697
+SHA256 ec85c70b19747b81c597c876f2fc4d41042fe6bfc228b235564a59a3b5e5480b nullmailer-1.02.ebuild 4697
diff --git a/mail-mta/nullmailer/files/digest-nullmailer-1.00 b/mail-mta/nullmailer/files/digest-nullmailer-1.00
index af23048d4c3a..e8e6c303fe66 100644
--- a/mail-mta/nullmailer/files/digest-nullmailer-1.00
+++ b/mail-mta/nullmailer/files/digest-nullmailer-1.00
@@ -1 +1,3 @@
 MD5 ead32b3543ef652891edf3856ec759dd nullmailer-1.00.tar.gz 170605
+RMD160 cd45934be7a8a9391f31452fe56b6166cb730306 nullmailer-1.00.tar.gz 170605
+SHA256 1ebb63f010a46dce9559b1025f76e74741429071cd2d4f380a63a5ced3ce8340 nullmailer-1.00.tar.gz 170605
diff --git a/mail-mta/nullmailer/files/digest-nullmailer-1.02 b/mail-mta/nullmailer/files/digest-nullmailer-1.02
new file mode 100644
index 000000000000..e29631efde49
--- /dev/null
+++ b/mail-mta/nullmailer/files/digest-nullmailer-1.02
@@ -0,0 +1,6 @@
+MD5 848d5c1f41a78e6897aeeb615e484d38 nullmailer-1.02.tar.gz 171591
+RMD160 5be509670c0524bec7d7e664901f88f0872536bf nullmailer-1.02.tar.gz 171591
+SHA256 a35298470ba5e0f7f14d17f4a2e76039413b214c7b80921fa9a00598ecf6243d nullmailer-1.02.tar.gz 171591
+MD5 f9a7c953683682eb797841fd80ee3a95 nullmailer_1.02-1.diff.gz 21242
+RMD160 152b8336e7f041cf0ad3f7058e1e81b8a99dcb1e nullmailer_1.02-1.diff.gz 21242
+SHA256 a19b36e872880757626c7151d6e0d942ccd2d462929fe873f2d9be5eed18a07a nullmailer_1.02-1.diff.gz 21242
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer b/mail-mta/nullmailer/files/init.d-nullmailer
new file mode 100644
index 000000000000..070c5737e13d
--- /dev/null
+++ b/mail-mta/nullmailer/files/init.d-nullmailer
@@ -0,0 +1,56 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/files/init.d-nullmailer,v 1.1 2006/01/30 03:50:34 robbat2 Exp $
+
+DAEMON="/usr/sbin/nullmailer-send"
+ARGS="--daemon"
+USER=nullmail
+GROUP=nullmail
+
+depend() {
+	need net logger
+}
+
+checkconfig() {
+	local error=0
+	local f=/etc/nullmailer/me
+	if [ ! -s ${f} ]; then
+		eerror "${f} does not exist"
+		error=1
+	fi
+	f=/etc/nullmailer/defaultdomain
+	if [ ! -s ${f} ]; then
+		eerror "${f} does not exist"
+		error=1
+	fi
+	if [ ${error} -eq 1 ]; then
+		einfo "You need to run 'emerge --config nullmailer'!"
+	fi
+	if [ -e /service/nullmailer ]; then
+		eerror "Nullmailer is already running under svscan!"
+		error=2
+	fi
+	if [ ${error} -ne 0 ]; then
+		return 1
+	else
+		return 0
+	fi
+}
+
+start() {
+	checkconfig
+	ebegin "Starting nullmailer"
+	cd /var/nullmailer
+	start-stop-daemon --start --quiet --chuid ${USER}:${GROUP} \
+			  --exec ${DAEMON} -- ${ARGS}
+	eend $?
+}
+
+stop() {
+	checkconfig # to avoid init.d stopping svscan instance
+	ebegin "Stopping nullmailer"
+	cd /var/nullmailer
+	start-stop-daemon --stop --user ${USER} --exec ${DAEMON} 
+	eend $?
+}
diff --git a/mail-mta/nullmailer/nullmailer-1.02.ebuild b/mail-mta/nullmailer/nullmailer-1.02.ebuild
new file mode 100644
index 000000000000..a4f92b72828e
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-1.02.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.02.ebuild,v 1.1 2006/01/30 03:50:34 robbat2 Exp $
+
+inherit eutils flag-o-matic
+
+MY_P="${P/_rc/RC}"
+S=${WORKDIR}/${MY_P}
+DEBIAN_PV="1"
+DEBIAN_SRC="${MY_P/-/_}-${DEBIAN_PV}.diff.gz"
+DESCRIPTION="Simple relay-only local mail transport agent"
+SRC_URI="http://untroubled.org/${PN}/${MY_P}.tar.gz
+		mirror://debian/pool/main/n/${PN}/${DEBIAN_SRC}"
+HOMEPAGE="http://untroubled.org/nullmailer/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="mailwrapper"
+
+DEPEND="virtual/libc
+		sys-apps/groff"
+RDEPEND="!mailwrapper? ( !virtual/mta )
+		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+		virtual/libc
+		>=sys-process/supervise-scripts-3.2
+		>=sys-process/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=-1
+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
+	EPATCH_OPTS="-d ${S} -p1" \
+	epatch ${DISTDIR}/${DEBIAN_SRC}
+	EPATCH_OPTS="-d ${S} -p1" \
+	epatch ${S}/debian/patches/03ipv6.diff || die "IPV6 patch failed"
+	EPATCH_OPTS="-d ${S} -p1" \
+	epatch ${S}/debian/patches/05syslog.diff || die "daemon/syslog patch failed"
+	# this fixes the debian daemon/syslog to actually compile
+	sed -i.orig \
+		-e '/^nullmailer_send_LDADD/s, =, = ../lib/cli++/libcli++.a,' \
+		${S}/src/Makefile.am || die "Sed failed"
+}
+
+
+pkg_setup() {
+	setupuser
+}
+
+src_compile() {
+	append-ldflags $(bindnow-flags)
+	# 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
+		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
+	msg_mailerconf
+	newinitd ${FILESDIR}/init.d-nullmailer nullmailer
+}
+
+pkg_config() {
+	[ ! -s /etc/nullmailer/me ] && /bin/hostname --fqdn >/etc/nullmailer/me
+	[ ! -s /etc/nullmailer/defaultdomain ] && /bin/hostname --domain >/etc/nullmailer/defaultdomain
+	msg_svscan
+	msg_mailerconf
+}
+
+msg_svscan() {
+	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"
+	einfo "As an alternative, we also provide an init.d script."
+}
+msg_mailerconf() {
+	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
+
+	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
+	msg_mailerconf
+}