mail-mta/nullmailer: Port debian patches to 0.13 which enables syslog again, #496960

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

6 files changed, 175 insertions, 163 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index a0ccb25a8584..e2bb122f29b3 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.79 2013/12/21 18:56:55 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.80 2014/01/08 15:03:05 jlec Exp $
+
+*nullmailer-1.13-r3 (08 Jan 2014)
+
+  08 Jan 2014; Justin Lecher <jlec@gentoo.org> +nullmailer-1.13-r3.ebuild,
+  -files/remotes.sample-1.04, -files/remotes.sample-1.11,
+  -files/init.d-nullmailer-r1, -files/init.d-nullmailer-r2:
+  Port debian patches to 0.13 which enables syslog again, #496960
 
   21 Dec 2013; Agostino Sarubbo <ago@gentoo.org> nullmailer-1.13-r2.ebuild:
   Stable for ppc, wrt bug #480060
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r1 b/mail-mta/nullmailer/files/init.d-nullmailer-r1
deleted file mode 100644
index 5b5f58e110b9..000000000000
--- a/mail-mta/nullmailer/files/init.d-nullmailer-r1
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/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/files/init.d-nullmailer-r2 b/mail-mta/nullmailer/files/init.d-nullmailer-r2
deleted file mode 100644
index 1043d962d52c..000000000000
--- a/mail-mta/nullmailer/files/init.d-nullmailer-r2
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/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.2 2013/01/08 12:44:00 eras Exp $
-
-DAEMON="/usr/sbin/nullmailer-send"
-ARGS="--daemon"
-USER=nullmail
-GROUP=nullmail
-
-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() {
-	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.04 b/mail-mta/nullmailer/files/remotes.sample-1.04
deleted file mode 100644
index 3a6f449e466b..000000000000
--- a/mail-mta/nullmailer/files/remotes.sample-1.04
+++ /dev/null
@@ -1,20 +0,0 @@
-# Format is: HOST PROTOCOL [OPTIONS]
-# HOST = IP or DNS
-# PROTOCOL = smtp | qmtp
-# OPTIONS = [--port=NUMBER] [--auth=user,pass]
-#
-# 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
diff --git a/mail-mta/nullmailer/files/remotes.sample-1.11 b/mail-mta/nullmailer/files/remotes.sample-1.11
deleted file mode 100644
index 4e692258691e..000000000000
--- a/mail-mta/nullmailer/files/remotes.sample-1.11
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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.13-r3.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r3.ebuild
new file mode 100644
index 000000000000..41130af372a3
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-1.13-r3.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r3.ebuild,v 1.1 2014/01/08 15:03:05 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
+	http://dev.gentoo.org/~jlec/distfiles/${PN}-patches-${PV}.tar.xz"
+#		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}
+
+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
+#	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
+
+	# old debian patches from 1.11
+	# DO NOT APPLY patch 0009... It breaks
+	epatch "${WORKDIR}"/patches/000{1..8}*patch
+
+	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
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+	eautoreconf
+}
+
+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
+	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
+
+	newinitd "${FILESDIR}"/init.d-nullmailer-r3 nullmailer
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	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 || die
+	chown root:nullmail /etc/nullmailer/remotes || die
+
+	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_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"
+		/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
+}