mail-mta/nullmailer: Drop old vulnerable versions, #480376; respect AR, #480394; make paludis happy, #462846 thanks Thomas Witt for the patch; fix broken openrc initscript, #480354

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

9 files changed, 134 insertions, 422 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index d8c6adf15b34..1c01649d7f6f 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for mail-mta/nullmailer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.73 2013/09/25 08:14:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.74 2013/09/25 10:16:58 jlec Exp $
+
+*nullmailer-1.13-r2 (25 Sep 2013)
+
+  25 Sep 2013; Justin Lecher <jlec@gentoo.org> -nullmailer-1.11.ebuild,
+  -nullmailer-1.11-r1.ebuild, nullmailer-1.11-r2.ebuild,
+  nullmailer-1.11-r3.ebuild, -nullmailer-1.13.ebuild,
+  -nullmailer-1.13-r1.ebuild, +nullmailer-1.13-r2.ebuild,
+  +files/init.d-nullmailer-r3:
+  Drop old vulnerable versions, #480376; respect AR, #480394; make paludis
+  happy, #462846 thanks Thomas Witt for the patch; fix broken openrc
+  initscript, #480354
 
   25 Sep 2013; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add myself as maintainer
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 564c798c069d..7a3ad434dd15 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -3,6 +3,7 @@ Hash: SHA512
 
 AUX init.d-nullmailer-r1 1220 SHA256 53647c3756bdff6b3753f91f1aed61649f35294ae06e757b613ab58b5ca55c85 SHA512 174d0e33f9cfd4c34d937f64b74084ca56b6c600d55a4ddee24c42b8b1f6c69d73d3126bfd943ce47c8121751a3cf331cea4bd2f703e610d3c7f1835510782d4 WHIRLPOOL 4d0acdf85725b74b356af4d4346ae73d21f53682b649f9fbbde111e0725cdd4d29ac81cca54f7b2bab5e0d93002db5ef6d9427a0bcf9e7ab41673776792a7cc3
 AUX init.d-nullmailer-r2 1219 SHA256 48c4e38577a6b02cab0e7db9235f09b93edbfb273cb31308500fa9023d0cf41e SHA512 05996148cdd38d5da63fc30bfcd50cf5e37b56ed64d20ede70be5ee340d9998a0636a4f9c30345439394005ddf25eb2866de030f053e742d7f1de96aaed059c3 WHIRLPOOL 5553219caf2f92777cd55ee21834b83dd280a894ef2a38cd25097fe3ba9c0f16dee105338a95f68437100de697a2722ead5463db2f405ea83e6b0395b1a9aac8
+AUX init.d-nullmailer-r3 1076 SHA256 1f59a1e06c5c709f16343c581ffa318f4c8eb342b77f86af52af8d736f77b6bd SHA512 041d6269a270cd8aea1b1d5b9175d5de3e44386e87e6f14109416459f6b484caf4f85a200644c4e0ea5c431e6b58c6804e56c0f961ac23eecfd7ff7026761945 WHIRLPOOL b71cef10bfe9211d08f03c4fa480a8a5c2a33ff42c8889a273303af37b8e6b75a7bf29e0f90ddff4410675daf0cb4276efa1e3186b4c6006a22c1c3a0bbfe60b
 AUX nullmailer.service 398 SHA256 a8083aa8c784fef00c6b0dab6733874edbbf1d01c2060bc512f83168eba8485a SHA512 09efea2dde679f5fda9afee376351c54a71742aff21457481ced5cffdcccd837e12c742c9f1cf65dfb63cbf73f2a7ddfa89d09dee1169a8a05daf47d0e5f73c9 WHIRLPOOL 2d6697dbf52f10ae3136828b018c7bd949e61e8d170001207aaa1d16f3ac60e3ec64d15e6ff73a32a40de1aaefa6dda4d55fa54e54f2735babe3241925310a19
 AUX remotes.sample-1.04 540 SHA256 d9f756d9a2b21e7f7166c1b29a34c4dda1eb1ab0c57168ded3d0ed225cf692ee SHA512 ea0e75253804d792cab14d672ef88ccfc93b2d47c7e936e9de10b130a3270f5ca16b019ef71fc13f74ddd1fe12272060ae6664357b1dc019b9c93950bc0a583e WHIRLPOOL ed2af783ae2648cf23ce73523d47e462f809694b19c31055e2d0419da750ebff1c2403b1defad56b21c1d3a95d863f1880f391f52d1a30057d588ac1263371fa
 AUX remotes.sample-1.11 971 SHA256 a315887401d0fba184ace7b9ea9adfad3cb09b73884f4982dc4fe705079af15e SHA512 a3d305beb4526e20bbb5c92b4ed3afee21a9b926dd1067317351b54c4942d36f1e23b80f2fe503be8ea07597fdc728fa8c78394e7cc2e6cac7d50b7e74bb6494 WHIRLPOOL ee6417a5e963706f2824632f7a8004047ab96a17d9cd164339759572eb06449825fcbfa072750144faaa9d817efb1b6e11b451949f052ccd7fc490b410d85896
@@ -10,28 +11,25 @@ AUX remotes.sample-1.13 970 SHA256 56b9adc7762cfac88769ee6a87fa5057a42599a3d50a3
 DIST nullmailer-1.11.tar.gz 203239 SHA256 bf61c839b5f0927e0998c6183f229fa644f97165d3d5402adc59369b2bdaf25e SHA512 419798e6910e554e7d679a18e900555b52e061d3e085c0e958cc1e6b0c132840c285b669ad890baa3bd6191a371b88cec1e10aeaa49cd1c6cde33d881812fbeb WHIRLPOOL d05b0a1969135c8b83ee45494d96e3d13d431d55310b3f04d2fb6c71cffc0490a9fcbfa61ff4040f366e2d0372da35c5d2b331e520eadeb918bf557951daa494
 DIST nullmailer-1.13.tar.gz 205431 SHA256 3f8861ebb1b46cea0a1caf1e6236e1e0d2a5a91def19551b7cad12eab676277d SHA512 96dcb3ddecde77a73e5ca1afa5167d35f965d04999f02cc2ef60b54ea7eb7a006e5cf5678fc34a54d4be4f9fd71bd0f784a8671aca40c70dbc307666c548e1d7 WHIRLPOOL b041f7cc33a257fad11c5f4c9bf74f8d849d9c45f0dc19be28268462b9d029c07e1d5802698e647a4208d5f66cac2177a1d12e49a03caac51e0244c3f9a0599c
 DIST nullmailer_1.11-1.debian.tar.gz 33187 SHA256 86d64b37220c4e92680509152b20d08c2702ad313350b8e65dd1d754bd1b76c9 SHA512 67bdb686bc62ff924c2d4b1aac2f528d51e4d7b0d72df438b3197d7a8b3fd6a875be7eb681e092c024ed3d47ba5ed5e5b0bca4f4d07200ca4bbbdbe8fea4c2c9 WHIRLPOOL c2661a17fcf6686825079063d55500a4095b6bc6938729247fc1ef78c2476e352ee9101d56f8d082d537d2e8cab99e5e12eee6195d5c1c891f41f327fde79121
-EBUILD nullmailer-1.11-r1.ebuild 3980 SHA256 405933fd64da2b55b0bed92eab271c4ba30bb4248445254129550fdb9c876f75 SHA512 0ac9a9f48188fe8f1da7ebcb463d4b80c9d2f2bd583d0da78b5f65da789c11c77cf08fd2034da00fb873fdaee1eb91d39af5d00132c640e584460137ba184b6d WHIRLPOOL ab23a28795b52044293f0392aff94e250e8502416dd93c26c196f9eed4a7cedb9d57f92ee5f79a3f59ae36fdabcf6e327a35f7189d0320a03829713edc3bc43c
-EBUILD nullmailer-1.11-r2.ebuild 4241 SHA256 6681e7172ca452a5a6eb5d012bb1c4329c1a6e994fcee604ad1a5e34871bcd9e SHA512 e188a39063ac4a75bec3747b62d73cd57c1089be9a2b361304046fdb64ba700df9d4902a0ba7207f3b109f895a742f4d068725bdaa73c26bb0bb13c19dc72738 WHIRLPOOL 415dfd4c6d326e1cd514298857d730f86d136f10db1712bbd8ac0823ab76f5d0b88f7cda2a665dea035109d126f1f4c27741996687ce0aec9d5d21514ec78175
-EBUILD nullmailer-1.11-r3.ebuild 4298 SHA256 2f2317105048a5e8219ba5201db8a1a7ce762d05e7480bcc3744f9648ed6efc4 SHA512 a4016be9edc98639dc4a83bff1d3f0958375649b4afbfa6b8e6ff8f70fff2400708580101c01ee5dbdd6c9ead878d30eb65191b2b3196763b8aea50a788c4190 WHIRLPOOL fb5b8e3f69562a42bcb87cfd99237b0326a60fb05f29318c7a8deaf2c6ee53d9d939b196c499eed0ca74588fbfaf853a5b05e2276fdcdf5a929ab318eb4a4fd1
-EBUILD nullmailer-1.11.ebuild 3923 SHA256 0c502a2cde5087c866fb97fbbe490061e885a991abca6b1c33bab2398734d65d SHA512 9c72b5adb7556b1aa612fe5e6846a521f3199dc3af3776aad370cf512b7da2392b63a6c12d32c6b9591d4880ee989dc205289c1f8078863b5a18ac0dd48eb3c2 WHIRLPOOL 742e4b5be4fbce108cde144b11a0479a542e6d2edd4b5a2e62f5f049febd93330c25f3912682e0256e7c707758765697f6a8ea8054c35cf7f8ef6ba947bd51fb
-EBUILD nullmailer-1.13-r1.ebuild 4292 SHA256 13f7893433410daae9a371690de77e3de2ad76ba188f7b80ead585335d28d5b2 SHA512 514fdcc3ccffde83f5997ad8705231dd2c1c88554ca73edca3b08ede517ad841c1972ea42b60478f9f982a56091f10f4e5a741b397932a35be88c8cd89de3723 WHIRLPOOL ab139a1415a8c2608eb6d75aa9c044f32228176f7296c0b47c83e6b92c09ccb17ecca592caf8838fbab25f70eb9e5fcf519b40bc76f703d0d2d9fd50606a8580
-EBUILD nullmailer-1.13.ebuild 4024 SHA256 5db8e604c3cb9a624ee06a669689152aacf3f52a6e9c6a6661f4ad51abd16496 SHA512 4b56e18ba4aeed2dc14a18c945ba88311c06b4bbaf38630808c8521e4b28f5d2b4a175a72ac213a0eaca1f3a9b9c19e3591430f8ad94f6655c173d1725c171dc WHIRLPOOL bf3017642dd57d7f029c09c3ebe7b6c121d3bcc6f51977cb83b1209334d2a245e440f7b0580c209ee129404ffc2d34ad381599c85a51b67cf29d95581e93fb43
-MISC ChangeLog 13505 SHA256 68779c6c061c8ea44e20f6a6d8534317de553b7f7e4cd699701ce9905066e50d SHA512 f58750e8e2c22f490e6253bac5f45f80d0de42787cf4b76cf7d341f9f58271660b2192887146d431406fc768b65be83559f54ee8f38b691e845d75f70b46bac6 WHIRLPOOL 9e31108df51bac2aa7aeeb9b46f085e775726e78e0100640a9f27a4ba7101b3e6007f29152e0bc8cb6d9b469b44f4de6f619bc57525903289f9da44343a60327
+EBUILD nullmailer-1.11-r2.ebuild 4348 SHA256 f9b831b63a3d33bcb1b9c354aa802a1e4cfea205b2bd5ab5cedecaa4ad9ac213 SHA512 c98ed5344fb97e1a0b4c899855c9463c54d285ed93487b03385d13fd2791fa94fd2d9a469cd6626db1078f91cad5f241178bd9fb6a965290213a922a2e09f73c WHIRLPOOL 0377c9d2cb29dc3bdc28d9a4ba19701753f3ab4362067a562fbfcf9c93276225196c63f1869c2caacd7053c72fccbb6b75c61e1e69fcb164fd69d4cffdf130d0
+EBUILD nullmailer-1.11-r3.ebuild 4407 SHA256 6475568ed64613d0ae92f9944a054f687a99075e98c311b9008eb19771add64c SHA512 d06b983341c502ddd5b10065805e2df84f2819629eb081e96c76074a0097227f249106739781e69269556ddf4ddef42c9960502d5389393c9243d1a6ca33c725 WHIRLPOOL 76e76b8d7201dd71b1708ec53e9a787ac2da5887a413b13969315a7b3197fb105d8ed12a18067bce803799bd545afd942031461d5a7797e74094cbab96dc3635
+EBUILD nullmailer-1.13-r2.ebuild 4524 SHA256 d9774618fd5f44e1e53d21c906e7ff9b8333cd723074f49ce9187c597e35e246 SHA512 47ff7185dcfc41b378438f385b50a941f1fa65c2b75c379beeb85f865d072e22f8b63694a89dff533462689dfde1790d9bccc309a947ebb5c09a6b32562ff568 WHIRLPOOL 83b20d802431471e6bea45f0a172806faa3d62245d11ea2602e0b7c4bff2b1e6066fd8f69bf2be1f381f932939b0a6d2e5f21ac83a51fde64afe5caa656f90ef
+MISC ChangeLog 13979 SHA256 4485cc52a9ba81d2a758c618346a4a4d8b9d3aedb3b15835d39653c2f9b97270 SHA512 bab0f07f32beea10a0aeb211a2c44c718a703dd742cff254ff9f9b5e6eb6f4a642f83af2090882d5d51d0d08c0859e5e5afb2ce32fddb3ad73b2ae40ec99f942 WHIRLPOOL 99b6fed6a4aaebbb4fddd797437c7ba05590d288b38946c770a370b26303c724ff3ec8a97ba18afdf7bf6bef97c831fae973d8839ca27aed0a21739f8f4bde88
 MISC metadata.xml 363 SHA256 838fae6a4f4cabb0217b0d1ebbd63acf840e802b3852e7360a4b9ae12a10459e SHA512 18675ce1eba12e093f0d73ac35ca6e456d2d7c0b1f3eee41d9b5bb466391778e3aed877d06028e7fa28c121dfff20fd6729451e5c5706a5ebc33a4f3c10c6f85 WHIRLPOOL d8911b227b42c2f4e47d68cb72f65c1e3349df2e34659aa4a597522138e9f8b055913829e504e11492db81081fbeb51e4b62512aeffde65d105e1120fbd572a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSQpszAAoJELnU8jG9FVirEf4P/iNIpHv9utXRfEXdAA8s/gOv
-PbWWhntXM/1PsDLfT8es8IJ+0WBV9THF+WHUpmTkKDCCzW2UyvMWvoiqnSSSjfe0
-7AtZ9qeSRNtE6sAm8nif6MJz12K5+N4Ug6NLJ5MLmkJMyZ7aftJ1NumL2pRfI4qG
-poVI4700M+2f6J7bB6RQs4Kn6k15fTKGKfF2Qr6uI0CD5Zy6nkZy9noA22bC+09K
-riyO7CFo32H3CYJXJN1R7kQlnTa2MHJVdY6fN1uF/0MWmIfkQj/xzR9MIIw04OIQ
-j3dX2yD88p6NL3PbZO2aM4ysTiM87GGapidc3nGzmFl33A0nNPZAOksOaWdU/AlG
-iPMzR+8771AqgyfbctuFkF2M9u17hyV2aCPGrzCFdQPopgg29H2s90A0NEaj58Sv
-VafazQAlBlCStnrJqK4u8pR0esARcy6NshqoXcdFigQh8369ThvujQTRYTpsq/V8
-ULt8GqnuDyhvi1yzWcVjUVKv36u3v52X9yJLZq6ggouc2mMXgm2ZkRmO4OPM4/J+
-u/9rVmQCqIZlew1PcjhyPy+ea3VDoADp4WbQ4tV56DPTcRucUvB0TPEC5cLSHaBL
-mlDCvvLK9RiJieFlu45tEIjTt7Unb+CHKIfFp5LYClTmg9UrDORzKJM+xPpn9Sar
-OKA52eI1VUs/m/EbV+kB
-=ExN3
+iQIcBAEBCgAGBQJSQrgDAAoJELnU8jG9FVir7MQP/0U47PiGcU871qiM+CC395rF
+t+EnwCENfoUZodBnkEw1su29Vm3JFWWoaCOakWNoMnOnuYy44e+tkmumFgUiuTyB
+7agZnB3cUONEUZQBFHnnRBHlrAABHNcxRdNkrBNJCCVnwSu3Tz3c+Ggo1Po0lE6X
+/LL3T1fMFjCWoygFKmfE3sjSL3uhvgbHRyKMdcfK3zRQxXUzWM4vZYItPIsPMgUi
+/2l4LrZK0k5JvVU7VlUEK7RYQeBY3aVLus6l4aGhQ22LzhD5sbmxJbDuQManUV12
+V3aDT17aeNpM4qW6fgxHQoEp9NhaR8ZXIDy5xnDnvKo3Dh8OfFVoqGFDwyx/Y0M0
+/iMkPRr0pKug6BW/KR4tLNSvuUwqZHkwAgz8/xCv50lj7xtn12ubd9Zv88NzUjno
+SFLPPZCM6DixrY0vUZOL8yO0vI830S8oN/dAiiLAw5gmm1wLu9HTAIlwZPiyelfh
+Oc3IPS88XWqP/Ldz/FIzu7rZG1WPRf0bPPwgp6YqbE04ji+6go1zPXcteSG2ZO5G
+Sn5p3Dkcp1B1VSu+KpyAOku5cRpvw2fuvYekl3FJxzDq0rbn8rHU6drjijWUku5z
+UbJYdgvJby+p+gOSW/VZwNIwCjEXYzJ3eA7Hg68AnXu0XgJoWGLQjmHY3sNLdBp8
++wPYUSVjHkEw9+CF/UEV
+=ry8E
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r3 b/mail-mta/nullmailer/files/init.d-nullmailer-r3
new file mode 100755
index 000000000000..f55ef1fe6c06
--- /dev/null
+++ b/mail-mta/nullmailer/files/init.d-nullmailer-r3
@@ -0,0 +1,50 @@
+#!/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-r3,v 1.1 2013/09/25 10:16:59 jlec Exp $
+
+command="/usr/sbin/nullmailer-send"
+
+start_stop_daemon_args="--chdir /var/nullmailer --user nullmail:nullmail"
+
+required_dirs="/var/nullmailer"
+pidfile="/run/nullmailer.pid"
+command_background="true"
+
+depend() {
+	use 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_pre() {
+	checkconfig
+}
+
+stop_pre() {
+	checkconfig # to avoid init.d stopping svscan instance
+}
diff --git a/mail-mta/nullmailer/nullmailer-1.11-r1.ebuild b/mail-mta/nullmailer/nullmailer-1.11-r1.ebuild
deleted file mode 100644
index 6983fcb300c5..000000000000
--- a/mail-mta/nullmailer/nullmailer-1.11-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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.5 2013/02/28 17:52:54 zx2c4 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/opensmtpd
-	!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
-}
diff --git a/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild b/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild
index 28e00bbf11c9..60e4a1eebf8e 100644
--- a/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.4 2013/08/28 12:10:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild,v 1.5 2013/09/25 10:16:58 jlec Exp $
 
 EAPI=4
 WANT_AUTOMAKE="1.10.3"
@@ -53,6 +53,9 @@ src_prepare() {
 	sed -i.orig \
 		-e '/^nullmailer_send_LDADD/s, =, = ../lib/cli++/libcli++.a,' \
 		"${S}"/src/Makefile.am || die "Sed failed"
+	sed \
+		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
+		-i configure.in || die
 	eautoreconf
 }
 
diff --git a/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild b/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild
index 331416b276bf..8fad494ff650 100644
--- a/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild
@@ -1,9 +1,11 @@
 # 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-r3.ebuild,v 1.1 2013/09/08 11:05:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.11-r3.ebuild,v 1.2 2013/09/25 10:16:58 jlec Exp $
 
 EAPI=4
+
 WANT_AUTOMAKE="1.10.3"
+
 inherit eutils flag-o-matic autotools user multilib systemd
 
 MY_P="${P/_rc/RC}"
@@ -41,6 +43,11 @@ RDEPEND="virtual/shadow
 	!mail-mta/opensmtpd
 	!mail-mta/ssmtp"
 
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/nullmailer nullmail
+}
+
 src_prepare() {
 	sed -i -e 's/nullmailer-1.10/nullmailer-1.11/g' \
 		"${WORKDIR}"/debian/patches/*.diff || die
@@ -53,12 +60,12 @@ src_prepare() {
 	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
+	sed \
+		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
+		-i configure.in || die
+
+	eautoreconf
 }
 
 src_configure() {
diff --git a/mail-mta/nullmailer/nullmailer-1.11.ebuild b/mail-mta/nullmailer/nullmailer-1.11.ebuild
deleted file mode 100644
index 89477de3f8ea..000000000000
--- a/mail-mta/nullmailer/nullmailer-1.11.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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.ebuild,v 1.7 2013/02/28 17:52:54 zx2c4 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/opensmtpd
-	!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.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
-}
diff --git a/mail-mta/nullmailer/nullmailer-1.13-r1.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild
index f6562660eb11..fef08af7079c 100644
--- a/mail-mta/nullmailer/nullmailer-1.13-r1.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.13-r1.ebuild,v 1.2 2013/08/09 16:45:11 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild,v 1.1 2013/09/25 10:16:58 jlec Exp $
 
 EAPI=5
 
@@ -45,6 +45,11 @@ RDEPEND="
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/nullmailer nullmail
+}
+
 src_prepare() {
 #	sed -i -e 's/nullmailer-1.10/nullmailer-1.11/g' \
 #		"${WORKDIR}"/debian/patches/*.diff || die
@@ -57,14 +62,15 @@ src_prepare() {
 	sed -i.orig \
 		-e '/^nullmailer_send_LDADD/s, =, = ../lib/cli++/libcli++.a,' \
 		"${S}"/src/Makefile.am || die "Sed failed"
+	sed -i.orig \
+		-e '/\$(localstatedir)\/trigger/d' \
+		"${S}"/Makefile.am || die "Sed failed"
+	sed \
+		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
+		-i configure.in || die
 	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 \
@@ -74,44 +80,53 @@ src_configure() {
 
 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-${PV} remotes
+
 	# This contains passwords, so should be secure
 	fperms 0640 /etc/nullmailer/remotes
 	fowners root:nullmail /etc/nullmailer/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
+
+	newinitd "${FILESDIR}"/init.d-nullmailer-r3 nullmailer
 	systemd_dounit "${FILESDIR}"/${PN}.service
 }
 
 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 [ ! -e "${ROOT}"/var/nullmailer/trigger ]; then
+		mkfifo "${ROOT}"/var/nullmailer/trigger
+	fi
+	chown nullmail:nullmail \
+		"${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue,trigger} || die
+	chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue} || die
+	chmod 660 "${ROOT}"/var/nullmailer/trigger || die
 
 	# This contains passwords, so should be secure
-	chmod 0640 /etc/nullmailer/remotes
-	chown root:nullmail /etc/nullmailer/remotes
+	chmod 0640 /etc/nullmailer/remotes || die
+	chown root:nullmail /etc/nullmailer/remotes || die
 
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "To create an initial setup, please do:"
@@ -125,6 +140,12 @@ pkg_postinst() {
 	#echo
 }
 
+pkg_postrm() {
+	if [[ -e "${ROOT}"/var/nullmailer/trigger ]]; then
+		rm "${ROOT}"/var/nullmailer/trigger || die
+	fi
+}
+
 pkg_config() {
 	if [ ! -s "${ROOT}"/etc/nullmailer/me ]; then
 		einfo "Setting /etc/nullmailer/me"
diff --git a/mail-mta/nullmailer/nullmailer-1.13.ebuild b/mail-mta/nullmailer/nullmailer-1.13.ebuild
deleted file mode 100644
index 63b6ad766968..000000000000
--- a/mail-mta/nullmailer/nullmailer-1.13.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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.13.ebuild,v 1.1 2013/07/25 19:10:34 jlec Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib systemd user
-
-MY_P="${P/_rc/RC}"
-
-DEBIAN_PV=1.11
-DEBIAN_PR="2"
-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"
-HOMEPAGE="http://untroubled.org/nullmailer/"
-SRC_URI="http://untroubled.org/${PN}/archive/${MY_P}.tar.gz"
-#		mirror://debian/pool/main/n/${PN}/${DEBIAN_SRC}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ssl"
-
-DEPEND="
-	sys-apps/groff
-	ssl? ( net-libs/gnutls )"
-RDEPEND="
-	virtual/logger
-	virtual/shadow
-	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/opensmtpd
-	!mail-mta/ssmtp"
-
-S=${WORKDIR}/${MY_P}
-
-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-${PV} 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
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-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
-}