Version bump. Change --chuid to --user in init script. Bugs #415417 #405529

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 200 insertions, 6 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index 1584b5fd66a5..4bf07943f330 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-mta/nullmailer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.46 2012/06/04 21:06:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.47 2012/06/05 13:48:56 eras Exp $
+
+  05 Jun 2012; Eray Aslan <eras@gentoo.org> +files/init.d-nullmailer-r1:
+  Version bump. Change --chuid to --user in init script. Bugs #415417 #405529
 
   04 Jun 2012; Zac Medico <zmedico@gentoo.org> nullmailer-1.05.ebuild,
   nullmailer-1.06.ebuild:
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 739c9f2be521..6988600b69d0 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -1,19 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX init.d-nullmailer 1221 RMD160 9e793a57acc9f2123c75e5a27f4b6123ce1d171a SHA1 154b3c92512151d6d4f9dc63125536c44e207f1e SHA256 279dd0519b62b57b4f5f6a7bcbfcd8337dd3d5e6e785de1d443f2005def64d72
+AUX init.d-nullmailer-r1 1220 RMD160 a410c17c4c39962957c5864b6a09f5d0d2159fd3 SHA1 43db6a5addb1726c630a5ca1522f575d35270452 SHA256 53647c3756bdff6b3753f91f1aed61649f35294ae06e757b613ab58b5ca55c85
 AUX remotes.sample-1.04 540 RMD160 41a6f50c7d0cd0423be8d2e485e07148504316f7 SHA1 8aecf00f27f705a28e9c45c2e9807a3a4f4f309a SHA256 d9f756d9a2b21e7f7166c1b29a34c4dda1eb1ab0c57168ded3d0ed225cf692ee
 DIST nullmailer-1.05.tar.gz 176800 RMD160 20bd31670be76297a9798282db6186156d4f5124 SHA1 93cc8924cd96bf8a79285ff32bf5b0894de0a9e5 SHA256 90356ed2bd95eef09ed04713fdef1f81c1ab95e02eee333a96a8e3eb230cac2f
 DIST nullmailer-1.06.tar.gz 180380 RMD160 a534c9db53f3534e760407dcef6a6b36fdc3bf1b SHA1 4dbede45c727fd32601a90d8332cb9dcff124f0f SHA256 aa5813dae985c412fcb2e185c3dcfac64f581bcf4ce5d480437409c53c16a2bd
+DIST nullmailer-1.10.tar.gz 201324 RMD160 ffd824acf7ac4c068bad6816038129031936d8d6 SHA1 801515726cdf19deb018c61eb4bb2744bbe1b3dc SHA256 eda85acf95ccac886271c2d9d471b3e245288aa6597c925372e429defb7f75b7
 DIST nullmailer_1.04-1.diff.gz 47284 RMD160 0f6ba5985d6b47678f35b090a635630646dbbd14 SHA1 61525c2b5d9297c2a976c7107e1d16dab43d2259 SHA256 daa2a9388e8fa2a93401b9ee060a7f56f2f8e820af57aeba82a8abde838fcd75
+DIST nullmailer_1.10-1.debian.tar.gz 32950 RMD160 7c2194cf3c4a6dd3da9d68485a0dfc4f55602aa9 SHA1 168ead6ab0cf52699d1c016ad39cd38feffa3039 SHA256 97adc0ef257b8185100208d8c4b00b298843683a95c2e04011f424f49873fa03
 EBUILD nullmailer-1.05.ebuild 3993 RMD160 f5cd01f40a61a1e5b51480259aec7ef135e63b39 SHA1 94dc56e3fee5a3acddae859c4509f3ddb7ae2f4c SHA256 a85c5dc0b67d0e8fe68b74a0d40ac7d6478712acbf1d8d894a8bb542768274f7
 EBUILD nullmailer-1.06.ebuild 3987 RMD160 cb4ba9938d6015ed4075e317e3aec46a87eab907 SHA1 ee9056135f650ad86364ab0179c559d1cc355f25 SHA256 784a8132a6e61cba13532a048d2a9423f468bdfa93698616a9df08aaa7a8af83
-MISC ChangeLog 9646 RMD160 5f31b0db62f0368e20cfa36217c648465999a80f SHA1 4d33c2febc7489976be131042e50033a5f84d6c0 SHA256 285c1898c85bc5e6e9c4b86d70a935f80b045717be8951ca0203c6668d11af74
+EBUILD nullmailer-1.10.ebuild 3805 RMD160 95ca46d81927b4320bff66e65577dcda3ec46d5b SHA1 c0dd95b8d0637cf4bb680ec7f8409dd3139308fa SHA256 0e9c72f06e9adbf295f9a29d6e72ca512ed31b51e2147f6252ad500e07ceb0a1
+MISC ChangeLog 9795 RMD160 1e084af467c706bd3a5a5240938816cfdde012a8 SHA1 8bece79e9a126e047e08580b41c72fc01890d04a SHA256 5ff2ba00cb1e904d516e47084e2b2be880abe5b0a7830c17ad64bb7ccfb81cb2
 MISC metadata.xml 280 RMD160 9f5cd4ae71c9c7e45161110dd38d67f6604cd7b8 SHA1 4b9a055d510dca2f97d61f7df74fcefbc0cc0a2c SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/NI1EACgkQ/ejvha5XGaNk6gCfVuSlAdsW2QNo9B4t5gfc4iGI
-X48AoM1XXH1tpdIuYxKE9Gpnr4py+Cm6
-=Vzh3
+iQIcBAEBCAAGBQJPzg5XAAoJEHfx8XVYajsfgHIP/j/zAuY5m2c06deakjdQUXH2
+RNStIQOaFTv2Xl52Pnvrs1wLLxTH9DtX7qOUkM63e9d4+z6VYKddeEIOqmQ5DPn0
+DsHDm5gY5WcHGxGmEkeDqhG1etNBT360C6xZqyXn2ApvsWM/UFtzsN2XXAKXH8t0
+lr7zv4duwtLZwggJBcEOAzPx1+fj9+u6c5wDsZZwdMVspNZ7w56g1vdPwiNVvI9k
+oqVa9ec8gc2sVPdjGaLImBjfGmWNXfFhWDj7lmYjJNX63f20q/lg1/LhNPgOZMHR
+Vxysh73A+Ytq/DW2J7Ez/24+JQXYG98Zh6jWDUrdNUwQLEB5uYKgiZqlFS8o0yxZ
+lUiZOzvCth6QyiU3Gnp8PT0tUT1X/grXHt5S2OIbcfOYEwjCBwpShwTs+we2nxDM
+cGkbxSyXVbQ0M9WJlQtLcgPwZzSTunHb8ptONpu6iEh2oELSXAd9d1DUCeFhAjj+
+etbpbCgYa2YFldc/se4pMzT/c0miIYR9GX7bv6t2KoHDkwLpAIGeMxXRd5JTeAUO
+fN/w8mAyEp0n9cz0t44DZVzUzRV8GSCMctCzXQXUVD7WSAAL1+jacdFZA7U6FnLb
+QCKyUQfIuS50lr0m9FTBfDHrU8NJxusIlFOJPD/a8uNtXWqQ5aV3C5iQ7DRPwG80
+A/nKfvgQbJ+Y5cozkrou
+=GLi/
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r1 b/mail-mta/nullmailer/files/init.d-nullmailer-r1
new file mode 100644
index 000000000000..5b5f58e110b9
--- /dev/null
+++ b/mail-mta/nullmailer/files/init.d-nullmailer-r1
@@ -0,0 +1,56 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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-r1,v 1.1 2012/06/05 13:48:55 eras 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 --user ${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.10.ebuild b/mail-mta/nullmailer/nullmailer-1.10.ebuild
new file mode 100644
index 000000000000..cb7484330664
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-1.10.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.10.ebuild,v 1.1 2012/06/05 13:48:56 eras Exp $
+
+EAPI=4
+inherit eutils flag-o-matic autotools user multilib
+
+MY_P="${P/_rc/RC}"
+S=${WORKDIR}/${MY_P}
+DEBIAN_PV=1.10
+DEBIAN_PR="1"
+DEBIAN_P="${PN}-${DEBIAN_PV}"
+DEBIAN_PF="${DEBIAN_P/-/_}-${DEBIAN_PR}"
+DEBIAN_SRC="${DEBIAN_PF}.debian.tar.gz"
+DESCRIPTION="Simple relay-only local mail transport agent"
+SRC_URI="http://untroubled.org/${PN}/archive/${MY_P}.tar.gz
+		mirror://debian/pool/main/n/${PN}/${DEBIAN_SRC}"
+HOMEPAGE="http://untroubled.org/nullmailer/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="ssl"
+
+DEPEND="sys-apps/groff
+	ssl? ( net-libs/gnutls )"
+RDEPEND="virtual/shadow
+	virtual/logger
+	ssl? ( net-libs/gnutls )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/nbsmtp
+	!mail-mta/netqmail
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp"
+
+src_prepare() {
+	EPATCH_OPTS="-d ${S} -p1" \
+	epatch "${DISTDIR}"/${DEBIAN_SRC}
+	# why revert?  Ask Robin when he is back!
+	EPATCH_OPTS="-d ${WORKDIR} -p0 -R" \
+	epatch "${WORKDIR}"/debian/patches/02_ipv6.diff
+	# 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"
+
+	eautoreconf
+}
+
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/nullmailer nullmail
+}
+
+src_configure() {
+	# Note that we pass a different directory below due to bugs in the makefile!
+	econf \
+		--localstatedir=/var \
+		$(use_enable ssl tls)
+}
+
+src_install () {
+	einstall localstatedir="${D}"/var/nullmailer
+	dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO
+	# A small bit of sample config
+	insinto /etc/nullmailer
+	newins "${FILESDIR}"/remotes.sample-1.04 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/$(get_libdir)
+	dosym /usr/sbin/sendmail usr/$(get_libdir)/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
+	newinitd "${FILESDIR}"/init.d-nullmailer-r1 nullmailer
+}
+
+pkg_postinst() {
+	[ ! -e "${ROOT}"/var/nullmailer/trigger ] && mkfifo "${ROOT}"/var/nullmailer/trigger
+	chown nullmail:nullmail "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue,trigger}
+	chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue}
+	chmod 660 "${ROOT}"/var/nullmailer/trigger
+
+	elog "To create an initial setup, please do:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	echo
+	elog "To start nullmailer at boot you may use either the nullmailer init.d"
+	elog "script, or emerge sys-process/supervise-scripts, enable the"
+	elog "svscan init.d script and create the following link:"
+	elog "ln -fs /var/nullmailer/service /service/nullmailer"
+	echo
+}
+
+pkg_config() {
+	if [ ! -s "${ROOT}"/etc/nullmailer/me ]; then
+		einfo "Setting /etc/nullmailer/me"
+		/bin/hostname --fqdn > "${ROOT}"/etc/nullmailer/me
+	fi
+	if [ ! -s "${ROOT}"/etc/nullmailer/defaultdomain ]; then
+		einfo "Setting /etc/nullmailer/defaultdomain"
+		/bin/hostname --domain > "${ROOT}"/etc/nullmailer/defaultdomain
+	fi
+}