Documentation and init script update

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

5 files changed, 235 insertions, 16 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index a0cd0ceaadfc..d424d872f0bc 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,12 @@
 # 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.59 2012/12/06 11:27:28 eras Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.60 2013/01/08 11:37:08 eras Exp $
+
+*nullmailer-1.11-r1 (08 Jan 2013)
+
+  08 Jan 2013; Eray Aslan <eras@gentoo.org> +files/init.d-nullmailer-r2,
+  +files/remotes.sample-1.11, +nullmailer-1.11-r1.ebuild:
+  Documentation and init script update
 
   06 Dec 2012; Eray Aslan <eras@gentoo.org> -files/init.d-nullmailer,
   -files/nullmailer-1.10-fix-sendmail.patch, -nullmailer-1.05.ebuild,
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 63db2df58bb4..a274b01e7de1 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -2,26 +2,29 @@
 Hash: SHA256
 
 AUX init.d-nullmailer-r1 1220 SHA256 53647c3756bdff6b3753f91f1aed61649f35294ae06e757b613ab58b5ca55c85 SHA512 174d0e33f9cfd4c34d937f64b74084ca56b6c600d55a4ddee24c42b8b1f6c69d73d3126bfd943ce47c8121751a3cf331cea4bd2f703e610d3c7f1835510782d4 WHIRLPOOL 4d0acdf85725b74b356af4d4346ae73d21f53682b649f9fbbde111e0725cdd4d29ac81cca54f7b2bab5e0d93002db5ef6d9427a0bcf9e7ab41673776792a7cc3
+AUX init.d-nullmailer-r2 1232 SHA256 0c22a83a8f7d0429bc4d2cb047eaae8a9f1d6215561422900d85c7c2f1f42b5b SHA512 0d2854cdf1b564f510765dd3febd04157bd741e625eb295907d6b3d50c36de868b8cb3b21f319e36ea1ec9ba5f60f657fef71d26fb7baccc151bc16ce9747d2c WHIRLPOOL 7aaae2979bffd8aef370287bd4c827f79c8d961c4297fe87e1cf1b21fb43911164561eafcc731f8f53b7150008db51e600f9608f85ac47e34216f872f65abe88
 AUX remotes.sample-1.04 540 SHA256 d9f756d9a2b21e7f7166c1b29a34c4dda1eb1ab0c57168ded3d0ed225cf692ee SHA512 ea0e75253804d792cab14d672ef88ccfc93b2d47c7e936e9de10b130a3270f5ca16b019ef71fc13f74ddd1fe12272060ae6664357b1dc019b9c93950bc0a583e WHIRLPOOL ed2af783ae2648cf23ce73523d47e462f809694b19c31055e2d0419da750ebff1c2403b1defad56b21c1d3a95d863f1880f391f52d1a30057d588ac1263371fa
+AUX remotes.sample-1.11 971 SHA256 a315887401d0fba184ace7b9ea9adfad3cb09b73884f4982dc4fe705079af15e SHA512 a3d305beb4526e20bbb5c92b4ed3afee21a9b926dd1067317351b54c4942d36f1e23b80f2fe503be8ea07597fdc728fa8c78394e7cc2e6cac7d50b7e74bb6494 WHIRLPOOL ee6417a5e963706f2824632f7a8004047ab96a17d9cd164339759572eb06449825fcbfa072750144faaa9d817efb1b6e11b451949f052ccd7fc490b410d85896
 DIST nullmailer-1.11.tar.gz 203239 SHA256 bf61c839b5f0927e0998c6183f229fa644f97165d3d5402adc59369b2bdaf25e SHA512 419798e6910e554e7d679a18e900555b52e061d3e085c0e958cc1e6b0c132840c285b669ad890baa3bd6191a371b88cec1e10aeaa49cd1c6cde33d881812fbeb WHIRLPOOL d05b0a1969135c8b83ee45494d96e3d13d431d55310b3f04d2fb6c71cffc0490a9fcbfa61ff4040f366e2d0372da35c5d2b331e520eadeb918bf557951daa494
 DIST nullmailer_1.11-1.debian.tar.gz 33187 SHA256 86d64b37220c4e92680509152b20d08c2702ad313350b8e65dd1d754bd1b76c9 SHA512 67bdb686bc62ff924c2d4b1aac2f528d51e4d7b0d72df438b3197d7a8b3fd6a875be7eb681e092c024ed3d47ba5ed5e5b0bca4f4d07200ca4bbbdbe8fea4c2c9 WHIRLPOOL c2661a17fcf6686825079063d55500a4095b6bc6938729247fc1ef78c2476e352ee9101d56f8d082d537d2e8cab99e5e12eee6195d5c1c891f41f327fde79121
+EBUILD nullmailer-1.11-r1.ebuild 3961 SHA256 e8a832e575c659d80bfaa29ab3214b920aec65262a74033ccca95b490a5be149 SHA512 25ecfe5dc26a923947f5195f81b0a4f01df4fc539a8f5193486dc927e8e8cdf09c7d521b666104aa2dd15054b91aabd7c48ea8a5dc72e48a0097e7fbfa3c0ff7 WHIRLPOOL 8d779269c4cb20ba571814f3436fd05323f1faa1f35537f7b1a1830cf048a3c6d52105ce73073ba306395ce6e5b4be1cb4b72495256aaefeecc1802200b1de12
 EBUILD nullmailer-1.11.ebuild 3901 SHA256 fd671c3b9e37f6a167a62175e09ca06cc83769b6ccda92f4657f3d71941e0862 SHA512 61a0a7061a7ab3a6de68ddc0ac0a5c05b95c415713713b78e7a141224fa30b14eac0bbf081577df3c7cd645cc26f7e46b00f8470084f89c8deaea23a7a00f60a WHIRLPOOL c57ff9be7b8bf95cc9806480eb17687c306c42b8c997bb0ef8c3940a6bee8f3a63c28cf9f923d932a5ed70dfbe6083ebf1ddd1403d1a0dd62f9952aeb4302f78
-MISC ChangeLog 11396 SHA256 980d97ed04b90621be33510e68c03a3773ca8852d26d69f594c8a6ee4a098df6 SHA512 09e5b37b03b1c4253663e2a037f8e89b74670e0d3be77b77eafbe4f77a431635d2252f9013fa4c02b7fe087a10cfac9399232731dd292b552e743edc0ef7b83d WHIRLPOOL 7fa532ddb794ae48b10c67ecd54f9ec56b76c720e4cdf977d1ae476050bd1b045949a57105f65bf1c326ad6d098829cbd5352cb8484c61199929071615d82d05
+MISC ChangeLog 11602 SHA256 403a9e1d97ac7e36496260d965860a212868e6bfeb561e0bc59e5816eeaaf7b9 SHA512 372154299218317a3ecd9df47107ecb7179f529ecd672feb3eea1b6878b83a2e8b31cd62a75e25d4fda12e7afa59c3cab7119eebd8f1750377a3f6ebf498cd8a WHIRLPOOL 177785ba44fa6aa1e6a4af49da6499a3e046e6c1bd4ab5d2b3e49fc1c587a6fc05b816a52fe053d33e9cb9b9f00487a6e467bdc832ec99dbe863f87bfce9260b
 MISC metadata.xml 280 SHA256 1e7cf6dbb378d12f4d6569350ba23c49aa55a855240b78b5487532028b0ff540 SHA512 64fcd3cea4082dd07b14f6c43de22c264c343936c21c51a1c4ff314f107758953846468961f0f7dfda81b218782cd2c2686be5f61c171feb793e4d33c3aca027 WHIRLPOOL e2d2fc3dfa4d934ee598f98f92d10dfe233b06de83f2621c209c344f872806bbf724af3151b46b104b607541f5c01b327b21144269d554d143eeb33c3e722b79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQwIEsAAoJEHfx8XVYajsfO6cP/37Ipjnq8Or6oIXNgVS3wOFJ
-RN4hhhDSO9vJZE0lr1U1uKIm10S8mzuuxNbokRKuKzTHTPCiPGPd8P3qfI1Fd6rr
-Nbfqw/q5nGTqdwq95i2b5Rpc/Yjk1kfDkkyfLxcn+1mOktvAwxwiKBgPX5JI5SOP
-o7tOUfXPHet8aHUadKgORQOmQlQNHoLmxMiFkIP1jYXGZZ2MpJqlJOzoxFKapm70
-YfouvA6w4QuMKispSFxuolEV5mModOahvVkDy9fm49I9DW2LLYf/MyXg8wqQdB0c
-uOKePwosXC/dHUOja3WnnTYqMP1pf9zdJCcdMbh2f+meJt6LUvs7es5k7IPmGEVb
-7KRYwROHr7/LJOxdMiUzwFvoJsAyuAxslL0I51Kb2lJczDTdrPpxzZrMX0gPaGvb
-xvhnS3QkWSYR8fSnjb5oFvw0iLdf8Gh5vA6Ql1aaZPYwNQkGFRWxzuqg6+ZTbp7M
-5DUWUGLK4qhXIU69k+stDlbFQYZ/ys0pZ97WSHrlbijQL3lsxTuB5+c9fkEwHoaa
-1c7xU7AX5PV/nc1n9GwQhWN4RF0+5YRqnpLSPcuhjsop59a4376AoqOC6JkRw57P
-I4y7J7ixvKa3+A4EfiXlelSNoVS01RPNQ4xGOnSxtRSNt5Ffxnba3M6il9NjdSx2
-H7EeW6oT/DLuij7aDb4k
-=aY3k
+iQIcBAEBCAAGBQJQ7ATtAAoJEHfx8XVYajsfTUsP/iP3+7RbgDQ+iXYvRMTswVKo
+ZnuaqVXwFITIjrfyR6qAEIGZNRKaB/tmXoN8N3Zn57x3ysEw0LZNloKnopdv9IsY
+gFKjIKl3lS9TfNijaLNurlxMUL7oB/u4r3jTqWeJX7jiL5AeO4vG6zwSUeRQ4EJL
+0Oe4rw2WrUVQ1nXSovtklfquuwH8ToXV3NhhLxb1xy3XgP6fAMFZwRG5jvCHngFE
+Fz55mJCCSZpiuNhzfAZfyqPZOHDV1Dsb0bqxa7r9M7sZa3FFi/q1GG4Gb69L91n9
+uCe/Vy8d32cBiNPtFEgwGRBjY6CjMDpHDC/18KLUlWq0gsEttpo2+9vDSqCkX7g1
+PZ6oyl/1RHUh69AWdHYkzXd2uJFRaBBQ7Tl6DnzSvEG8wXqXGKrsx69jyIlNjuuX
+07N/daM2VXVXgvWJKH0c4TdLRqCC8UCtVgZD7yMevmjnyTGiGOjtFwLU35EAQBaM
+P3MosCae5X0rEVjw/c4jg7ZR2LLO7H+PgIYDnysnJoPCbxbgkN+cVNHoBPjhD/v5
+IIj6PY/653QGcXjM9zLWwMZS3AGwG6zT7Tyn1BO6y4jTmmS7RW0sUe5x8Y//qpfn
+hDOcYDczrm6TdU6HIy9J8KcxQBBSPJxqrP+2KSxV0RF/aOuWWcybp0wGnqDQiazz
+FJW8WlqU29YlTDXZ4ryr
+=4RDc
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r2 b/mail-mta/nullmailer/files/init.d-nullmailer-r2
new file mode 100644
index 000000000000..ccf53b374d06
--- /dev/null
+++ b/mail-mta/nullmailer/files/init.d-nullmailer-r2
@@ -0,0 +1,57 @@
+#!/sbin/runscript
+# Copyright 1999-2013 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-r2,v 1.1 2013/01/08 11:37:07 eras Exp $
+
+DAEMON="/usr/sbin/nullmailer-send"
+ARGS="--daemon"
+USER=nullmail
+GROUP=nullmail
+
+depend() {
+	use net logger
+	provide mta
+}
+
+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/files/remotes.sample-1.11 b/mail-mta/nullmailer/files/remotes.sample-1.11
new file mode 100644
index 000000000000..4e692258691e
--- /dev/null
+++ b/mail-mta/nullmailer/files/remotes.sample-1.11
@@ -0,0 +1,29 @@
+# Format is: HOST PROTOCOL [OPTIONS]
+# HOST = IP or DNS
+# PROTOCOL = smtp | qmtp
+# OPTIONS = [--port=NUMBER] [--auth=user,pass] [--starttls | --ssl [--insecure] ]
+#
+# Examples:
+# A standard SMTP server:
+# somesendmailserver.domain.com smtp
+#
+# A qmail server with QMQP setup:
+# someqmailserver.domain.com qmqp
+#
+# A nonstandard SMTP server setup:
+# someotherserver.domain.com smtp --port=2525
+#
+# SMTP server supporting AUTH PLAIN
+# mailserver smtp --user=<user> --pass=<pass>
+#
+# SMTP server supporting AUTH LOGIN 
+# mailserver smtp --user=<user> --pass=<pass> --auth-login
+#
+# SMTP server with smtps (legacy - use starttls instead)
+# mailserver smtp --user=<user> --pass=<pass> --port=465 --ssl
+#
+# SMTP server on submission port with starttls
+# mailserver smtp --user=<user> --pass=<pass> --port=587 --starttls
+#
+# SMTP server on submission port with starttls and self-signed certificate
+# mailserver smtp --user=<user> --pass=<pass> --port=587 --starttls --insecure
diff --git a/mail-mta/nullmailer/nullmailer-1.11-r1.ebuild b/mail-mta/nullmailer/nullmailer-1.11-r1.ebuild
new file mode 100644
index 000000000000..274126531489
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-1.11-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.11-r1.ebuild,v 1.1 2013/01/08 11:37:07 eras Exp $
+
+EAPI=4
+WANT_AUTOMAKE="1.10.3"
+inherit eutils flag-o-matic autotools user multilib
+
+MY_P="${P/_rc/RC}"
+S=${WORKDIR}/${MY_P}
+DEBIAN_PV=1.11
+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/netqmail
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp"
+
+src_prepare() {
+	sed -i -e 's/nullmailer-1.10/nullmailer-1.11/g' \
+		"${WORKDIR}"/debian/patches/*.diff || die
+	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.11 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
+	# usability
+	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-r2 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
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To create an initial setup, please do:"
+		elog "emerge --config =${CATEGORY}/${PF}"
+	fi
+	#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
+}