Bump to fix security bug #480376, /etc/nullmailer/remotes world-readable

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64

3 files changed, 145 insertions, 22 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index f1b5b39a6b96..da18eaba2d16 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.66 2013/07/25 19:10:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.67 2013/08/09 16:42:54 robbat2 Exp $
+
+*nullmailer-1.13-r1 (09 Aug 2013)
+
+  09 Aug 2013; Robin H. Johnson <robbat2@gentoo.org> +nullmailer-1.13-r1.ebuild:
+  Bump to fix security bug #480376, /etc/nullmailer/remotes world-readable
 
 *nullmailer-1.13 (25 Jul 2013)
 
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 53c17c743ce9..3b3cd17ad431 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-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 nullmailer.service 398 SHA256 a8083aa8c784fef00c6b0dab6733874edbbf1d01c2060bc512f83168eba8485a SHA512 09efea2dde679f5fda9afee376351c54a71742aff21457481ced5cffdcccd837e12c742c9f1cf65dfb63cbf73f2a7ddfa89d09dee1169a8a05daf47d0e5f73c9 WHIRLPOOL 2d6697dbf52f10ae3136828b018c7bd949e61e8d170001207aaa1d16f3ac60e3ec64d15e6ff73a32a40de1aaefa6dda4d55fa54e54f2735babe3241925310a19
@@ -12,23 +9,7 @@ DIST nullmailer-1.13.tar.gz 205431 SHA256 3f8861ebb1b46cea0a1caf1e6236e1e0d2a5a9
 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.ebuild 3923 SHA256 0c502a2cde5087c866fb97fbbe490061e885a991abca6b1c33bab2398734d65d SHA512 9c72b5adb7556b1aa612fe5e6846a521f3199dc3af3776aad370cf512b7da2392b63a6c12d32c6b9591d4880ee989dc205289c1f8078863b5a18ac0dd48eb3c2 WHIRLPOOL 742e4b5be4fbce108cde144b11a0479a542e6d2edd4b5a2e62f5f049febd93330c25f3912682e0256e7c707758765697f6a8ea8054c35cf7f8ef6ba947bd51fb
+EBUILD nullmailer-1.13-r1.ebuild 4293 SHA256 a687fc457bed5d4690d7083ac6516b38c1798cee416f67d135134986c26c8382 SHA512 0aa1a5c98a01592bd9a8752fd7c4151f139d54b955d716a473ee016962beac40897a29618e66249eba6dace6ed718fb71d626a8200b04835232590b642e32dd8 WHIRLPOOL ff79308765854a99bfd08b70fee21cac441450cd7a93ae5bb0af4779493927c79b968abb1b7f986cfa9f045ac10f8aa670be71578120d37075dac077e229291c
 EBUILD nullmailer-1.13.ebuild 4024 SHA256 5db8e604c3cb9a624ee06a669689152aacf3f52a6e9c6a6661f4ad51abd16496 SHA512 4b56e18ba4aeed2dc14a18c945ba88311c06b4bbaf38630808c8521e4b28f5d2b4a175a72ac213a0eaca1f3a9b9c19e3591430f8ad94f6655c173d1725c171dc WHIRLPOOL bf3017642dd57d7f029c09c3ebe7b6c121d3bcc6f51977cb83b1209334d2a245e440f7b0580c209ee129404ffc2d34ad381599c85a51b67cf29d95581e93fb43
-MISC ChangeLog 12426 SHA256 b27220e304e9e1f3cc844db9c865d89eeea7c703b1d308dca885e12a6b20ad3f SHA512 d9b6116900d8ab7a8d3bc5ef42dcc70545f9b259ef4314c33ae235b8fce7ef15a60d0c8ce77a4c597a621dba185a458dea0f21c8c5cf89d094ba361ee6db3872 WHIRLPOOL f9ad988edf49717c64ca52e1f94e77ef44587463b68caa188fa918e33dc0aec7e6957746cc75a19a025c986a11148a5f45a024e27ec170fdc65f94b233317478
+MISC ChangeLog 12621 SHA256 8f183649ff1b9ef6eb078029cc5ba2b47e7eb5dcc06ed63487e4624fe21c0fe1 SHA512 5faf1231e38f934416aa02b8b40cba808de066c9a73289723b14fc8dbdf732408787038c8fddd930f55296f10032dab44892a49f6f9ba141d08b0ff2ae254c69 WHIRLPOOL c6aa3f83e147fc462a06c42ed3c2df0cbdeef12731898b8ab0ab8c37153d9932d963a5b7f467bb436980fcae9b7729758c10c1ffee9fe51e4d9c332c3773ed4c
 MISC metadata.xml 266 SHA256 38cdb0bc3e04f07076b7e05385fb2e6fc0f8612bd4f95705c6d074798c7d2f2e SHA512 8ee40378a6f599e559b588a4fd4df8ffa3bb715ab79c3039e8824282ffd7030d6aa71288d2e20f768c9c39dae6b9a87969972ec1c0261c18c867e937c0d88d23 WHIRLPOOL b5c68a36c2fe07a7be08116af25dfc5f8a6e957b8c4376c5a19edb1abfeafec0d32af7515a3c898f18c35bf54e8860ed74113a509f86333e78ccfd52f0728f00
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJR8XguAAoJELnU8jG9FVir4XwP/RdwfpdMWt4M1LpeNxUXJCCx
-HLepsTJ7C49Y0jCutzgGrlg9PG5Acxlt97YTP9MqpzSTIj+fJAFkKY6t4tO2Bq75
-6+hlXZEM+Gnl+1lJ70+NDNlqRfNbPOENGlNVkPynFOhy9hhaemr6ZBSHzDpGa/bW
-I/kk9AnXIL5SfhC08ShH39QjHsbctl1a8vAf+PY2lHX4I6ilyfNRUa5FMOai29MW
-INBW5YL8nFdpADkYCv92KGkBK9wUc0WgTGEf+HGwuQOXTLJMEJE4Hq/ED8SlC6AU
-dzpo0RuMs6Bv4feZYxb46RFCK1NfXqUEDxWj6f+g+MXssaxOV5y0J6oRmQJ6WMH5
-18Hgs5I2kfn6qBn+FT31cYCzQeIJu3pP5z/VbFRRMfopImRD18hDiOYsMYwqj+qe
-pTitY8y+5IxYanT3dsu+YsPIFzVlXzj/ZQiDYiP/RIOXL7E5EOYgaEV5uLJDJTHy
-IZ4F7Gda4cBN2RY615ZDCc0mUmMtSWY3V+pwQAPG13qDnCpJACv/oXYRDd1gNodD
-QJoZooGTvkiKfvKfwCkCw6jaR5pUC6D7pL0FlzkN6KHAqFsA48F18CUKIt9WuNpe
-imzI6kfxb7Fp0+SyCazSaD1PBAwZbvuawsC7afNDynKgP772X+Bszb/x84yWrB7z
-D6YkB+b69cKl6ENEZEB/
-=GO6e
------END PGP SIGNATURE-----
diff --git a/mail-mta/nullmailer/nullmailer-1.13-r1.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r1.ebuild
new file mode 100644
index 000000000000..4d1b3efa71ae
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-1.13-r1.ebuild
@@ -0,0 +1,137 @@
+# 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.1 2013/08/09 16:42:54 robbat2 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
+	# 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
+	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
+	
+	# This contains passwords, so should be secure
+	chmod 0640 /etc/nullmailer/remotes
+	chown root:nullmail /etc/nullmailer/remotes
+
+	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
+}