Bump to fix security bug #480376, /etc/nullmailer/remotes world-readable (backport to stable)

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 142 insertions, 3 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index da18eaba2d16..45acd84d57ee 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,13 @@
 # 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.67 2013/08/09 16:42:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.68 2013/08/09 16:45:11 robbat2 Exp $
+
+*nullmailer-1.11-r2 (09 Aug 2013)
+
+  09 Aug 2013; Robin H. Johnson <robbat2@gentoo.org> +nullmailer-1.11-r2.ebuild,
+  nullmailer-1.13-r1.ebuild:
+  Bump to fix security bug #480376, /etc/nullmailer/remotes world-readable
+  (backport to stable)
 
 *nullmailer-1.13-r1 (09 Aug 2013)
 
diff --git a/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild b/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild
new file mode 100644
index 000000000000..c815f79ef8ee
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-1.11-r2.ebuild
@@ -0,0 +1,132 @@
+# 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.1 2013/08/09 16:45:11 robbat2 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-${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
+}
+
+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
+}
diff --git a/mail-mta/nullmailer/nullmailer-1.13-r1.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r1.ebuild
index 4d1b3efa71ae..f6562660eb11 100644
--- a/mail-mta/nullmailer/nullmailer-1.13-r1.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.13-r1.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.1 2013/08/09 16:42:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r1.ebuild,v 1.2 2013/08/09 16:45:11 robbat2 Exp $
 
 EAPI=5
 
@@ -108,7 +108,7 @@ pkg_postinst() {
 	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