[gentoo-commits] repo/gentoo:master commit in: mail-mta/nullmailer/files/, mail-mta/nullmailer/

[gentoo-commits] repo/gentoo:master commit in: mail-mta/nullmailer/files/, mail-mta/nullmailer/

[Sergei Trofimovich]

commit:     3ba4e746c3e6ec10fbb8df1b385b4e9ca85978df
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 14:49:09 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 14:49:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba4e746

mail-mta/nullmailer: remove '+=' bashism from init.d script

Noticed as a sourcing failure on a system with 'sh' ->/bin/dash:
    dash: 9: /etc/init.d/nullmailer: start_stop_daemon_args+= --stdout /var/log/nullmailer/nullmailer.log: not found
    dash: 10: /etc/init.d/nullmailer: start_stop_daemon_args+= --stderr /var/log/nullmailer/nullmailer.log: not found

Package-Manager: portage-2.3.2

 mail-mta/nullmailer/files/init.d-nullmailer-r6 |  52 ++++++++++
 mail-mta/nullmailer/nullmailer-2.0-r1.ebuild   | 138 +++++++++++++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r6 b/mail-mta/nullmailer/files/init.d-nullmailer-r6
new file mode 100644
index 00000000..389329e
--- /dev/null
+++ b/mail-mta/nullmailer/files/init.d-nullmailer-r6
@@ -0,0 +1,52 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+command="/usr/sbin/nullmailer-send"
+
+start_stop_daemon_args="--chdir /var/spool/nullmailer --user nullmail:nullmail"
+start_stop_daemon_args="${start_stop_daemon_args} --stdout /var/log/nullmailer/nullmailer.log"
+start_stop_daemon_args="${start_stop_daemon_args} --stderr /var/log/nullmailer/nullmailer.log"
+
+required_dirs="/var/spool/nullmailer /var/log/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-2.0-r1.ebuild b/mail-mta/nullmailer/nullmailer-2.0-r1.ebuild
new file mode 100644
index 00000000..4faea4c
--- /dev/null
+++ b/mail-mta/nullmailer/nullmailer-2.0-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic multilib systemd user
+
+DESCRIPTION="Simple relay-only local mail transport agent"
+HOMEPAGE="http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer"
+SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ssl"
+
+DEPEND="
+	sys-apps/groff
+	ssl? ( net-libs/gnutls:0= )"
+RDEPEND="
+	virtual/logger
+	virtual/shadow
+	ssl? ( net-libs/gnutls:0= )
+	!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"
+
+pkg_setup() {
+	enewgroup nullmail 88
+	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail
+}
+
+src_prepare() {
+	default
+	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.ac || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	sed \
+		-e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" \
+		-e 's:/usr/etc/:/etc/:g' \
+		-i doc/nullmailer-send.8 || die
+	eautoreconf
+}
+
+src_configure() {
+	# https://github.com/bruceg/nullmailer/pull/31/commits
+	append-lfs-flags #471102
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable ssl tls)
+}
+
+src_install() {
+	default
+
+	# 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/spool/nullmailer/service{,/log}
+
+	insinto /var/spool/nullmailer/service
+	newins scripts/nullmailer.run run
+	fperms 700 /var/spool/nullmailer/service/run
+
+	insinto /var/spool/nullmailer/service/log
+	newins scripts/nullmailer-log.run run
+	fperms 700 /var/spool/nullmailer/service/log/run
+
+	# usability
+	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail
+
+	# permissions stuff
+	keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
+	fperms 770 /var/log/nullmailer
+	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
+	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
+
+	newinitd "${FILESDIR}"/init.d-nullmailer-r6 nullmailer
+	systemd_dounit scripts/${PN}.service
+}
+
+pkg_postinst() {
+	if [ ! -e "${EROOT}var/spool/nullmailer/trigger" ]; then
+		mkfifo "${EROOT}var/spool/nullmailer/trigger" || die
+	fi
+	chown nullmail:nullmail \
+		"${EROOT}"var/log/nullmailer \
+		"${EROOT}"var/spool/nullmailer/{tmp,queue,trigger} || die
+	chmod 770 \
+		"${EROOT}"var/log/nullmailer \
+		"${EROOT}"var/spool/nullmailer/{tmp,queue} || die
+	chmod 660 "${EROOT}"var/spool/nullmailer/trigger || die
+
+	# This contains passwords, so should be secure
+	chmod 0640 "${EROOT}"etc/nullmailer/remotes || die
+	chown root:nullmail "${EROOT}"etc/nullmailer/remotes || die
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To create an initial setup, please do:"
+		elog "emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}var/spool/nullmailer/trigger" ]]; then
+		rm "${EROOT}var/spool/nullmailer/trigger" || die
+	fi
+}
+
+pkg_config() {
+	if [ ! -s "${EROOT}etc/nullmailer/me" ]; then
+		einfo "Setting /etc/nullmailer/me"
+		hostname --fqdn > "${EROOT}etc/nullmailer/me"
+	fi
+	if [ ! -s "${EROOT}etc/nullmailer/defaultdomain" ]; then
+		einfo "Setting /etc/nullmailer/defaultdomain"
+		hostname --domain > "${EROOT}etc/nullmailer/defaultdomain"
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: mail-mta/nullmailer/files/, mail-mta/nullmailer/

[Michael Haubenwallner]

commit:     1121a40affec68c6a41cf77bcabce065aed584f2
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  1 12:34:59 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 12:39:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1121a40a

mail-mta/nullmailer: import debian patches wrt tests

Fix a race condition while running tests, disable tests relying on
external resources like DNS and SMTP auth.

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 .../nullmailer-2.2-disable-dns-using-test.patch    | 26 ++++++++++
 .../nullmailer-2.2-disable-smtp-auth-tests.patch   | 57 ++++++++++++++++++++++
 .../nullmailer-2.2-fix-test-racecondition.patch    | 29 +++++++++++
 mail-mta/nullmailer/nullmailer-2.2.ebuild          |  6 +++
 4 files changed, 118 insertions(+)

diff --git a/mail-mta/nullmailer/files/nullmailer-2.2-disable-dns-using-test.patch b/mail-mta/nullmailer/files/nullmailer-2.2-disable-dns-using-test.patch
new file mode 100644
index 00000000000..0c5939ab004
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-2.2-disable-dns-using-test.patch
@@ -0,0 +1,26 @@
+https://sources.debian.org/data/main/n/nullmailer/1:2.2-3/debian/patches/0006-Disable-DNS-using-test.patch
+
+From: David Bremner <david@tethera.net>
+Date: Wed, 31 Oct 2018 09:18:53 -0300
+Subject: Disable DNS using test.
+
+This is probably against policy, and causes build failures in pbuilder
+---
+ test/tests/protocols | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/tests/protocols b/test/tests/protocols
+index 52209d7..8f67b0a 100644
+--- a/test/tests/protocols
++++ b/test/tests/protocols
+@@ -28,8 +28,8 @@ do
+ 
+ 	stop server
+ 
+-	echo "Testing host not found error with $p."
+-	error 2 protocol $p --host=this.host.can.not.exist 3<$testmail
++#	echo "Testing host not found error with $p."
++#	error 2 protocol $p --host=this.host.can.not.exist 3<$testmail
+ 
+ 	echo "Testing connection refused error with $p."
+ 	error 7 protocol $p -p $port --host=localhost 3<$testmail

diff --git a/mail-mta/nullmailer/files/nullmailer-2.2-disable-smtp-auth-tests.patch b/mail-mta/nullmailer/files/nullmailer-2.2-disable-smtp-auth-tests.patch
new file mode 100644
index 00000000000..f66a4841f4f
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-2.2-disable-smtp-auth-tests.patch
@@ -0,0 +1,57 @@
+https://sources.debian.org/data/main/n/nullmailer/1:2.2-3/debian/patches/0007-disable-all-smtp-auth-tests.patch
+
+From: David Bremner <david@tethera.net>
+Date: Tue, 25 Dec 2018 08:18:35 +0900
+Subject: disable all smtp-auth tests
+
+These seem racy in ways that I haven't been able to completely nail down
+---
+ test/tests/smtp-auth | 32 ++++++++++++++++----------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/test/tests/smtp-auth b/test/tests/smtp-auth
+index 52e12d0..2dc736f 100644
+--- a/test/tests/smtp-auth
++++ b/test/tests/smtp-auth
+@@ -1,25 +1,25 @@
+ . functions
+ export HELOHOST=f.q.d.n
+ 
+-make-testmail
++# make-testmail
+ 
+-start server "tcpserver -1 ::0 0 sh $srcdir/test/authtest-smtp.sh $tmpdir/smtp-result"
+-catch-port server
++# start server "tcpserver -1 ::0 0 sh $srcdir/test/authtest-smtp.sh $tmpdir/smtp-result"
++# catch-port server
+ 
+-echo 'Testing auth success with smtp'
+-echo '250 OK' > $tmpdir/smtp-result
+-protocol smtp --host=localhost --port=$port --user=example --pass=example 3<$testmail
++# echo 'Testing auth success with smtp'
++# echo '250 OK' > $tmpdir/smtp-result
++# protocol smtp --host=localhost --port=$port --user=example --pass=example 3<$testmail
+ 
+-echo 'Testing auth login success with smtp'
+-echo $'350 Go ahead\n250 AUTH' > $tmpdir/smtp-result
+-protocol smtp --host=localhost --port=$port --user=example --pass=example --auth-login 3<$testmail
++# echo 'Testing auth login success with smtp'
++# echo $'350 Go ahead\n250 AUTH' > $tmpdir/smtp-result
++# protocol smtp --host=localhost --port=$port --user=example --pass=example --auth-login 3<$testmail
+ 
+-echo 'Testing auth temporary failure with smtp'
+-echo '450 No' > $tmpdir/smtp-result
+-error 16 protocol smtp --host=localhost --port $port --user=example --pass=example 3<$testmail
++# echo 'Testing auth temporary failure with smtp'
++# echo '450 No' > $tmpdir/smtp-result
++# error 16 protocol smtp --host=localhost --port $port --user=example --pass=example 3<$testmail
+ 
+-echo 'Testing auth permanent failure with smtp'
+-echo '550 No' > $tmpdir/smtp-result
+-error 20 protocol smtp --host=localhost --port $port --user=example --pass=example 3<$testmail
++# echo 'Testing auth permanent failure with smtp'
++# echo '550 No' > $tmpdir/smtp-result
++# error 20 protocol smtp --host=localhost --port $port --user=example --pass=example 3<$testmail
+ 
+-stop server
++# stop server

diff --git a/mail-mta/nullmailer/files/nullmailer-2.2-fix-test-racecondition.patch b/mail-mta/nullmailer/files/nullmailer-2.2-fix-test-racecondition.patch
new file mode 100644
index 00000000000..8f721d8d8cc
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-2.2-fix-test-racecondition.patch
@@ -0,0 +1,29 @@
+https://sources.debian.org/data/main/n/nullmailer/1:2.2-3/debian/patches/0001-Remove-race-conditions-from-tests.patch
+
+From: Felix Lechner <felix.lechner@lease-up.com>
+Date: Sat, 2 Sep 2017 09:57:43 -0300
+Subject: Remove race conditions from tests
+
+Testing the qmqp protocol fails because the testing server cannot
+acquire the lock.  This is solved by waiting for the previous
+server to exit gracefully and clear the lock. Similarly, wait
+before removing temporary directories.
+
+Forwarded: no
+Last-Update: 2017-10-07
+---
+ test/tests/protocols | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/tests/protocols b/test/tests/protocols
+index 0309d12..52209d7 100644
+--- a/test/tests/protocols
++++ b/test/tests/protocols
+@@ -54,6 +54,7 @@ do
+ 	echo "Testing protocol failure with $p."
+ 	error 11 protocol $p -p $port --host=localhost 3<$testmail
+ 	stop server
++	wait
+ done
+ 
+ stop server

diff --git a/mail-mta/nullmailer/nullmailer-2.2.ebuild b/mail-mta/nullmailer/nullmailer-2.2.ebuild
index 178c1507ac2..59e8c37fad7 100644
--- a/mail-mta/nullmailer/nullmailer-2.2.ebuild
+++ b/mail-mta/nullmailer/nullmailer-2.2.ebuild
@@ -35,6 +35,12 @@ RDEPEND="
 	!mail-mta/ssmtp[mta(+)]
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-test-racecondition.patch"
+	"${FILESDIR}/${P}-disable-dns-using-test.patch"
+	"${FILESDIR}/${P}-disable-smtp-auth-tests.patch"
+)
+
 pkg_setup() {
 	enewgroup nullmail 88
 	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail

[gentoo-commits] repo/gentoo:master commit in: mail-mta/nullmailer/files/, mail-mta/nullmailer/

[Joonas Niilola]

commit:     a9fee5c109c671e034d31127ea59d988ab15f5fb
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Sun Jan 17 10:25:02 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 06:02:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9fee5c1

mail-mta/nullmailer: fix build with clang (c++11)

Closes: https://bugs.gentoo.org/669746
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/19088
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../nullmailer/files/nullmailer-2.2-c++11.patch    | 36 ++++++++++++++++++++++
 mail-mta/nullmailer/nullmailer-2.2-r1.ebuild       |  1 +
 2 files changed, 37 insertions(+)

diff --git a/mail-mta/nullmailer/files/nullmailer-2.2-c++11.patch b/mail-mta/nullmailer/files/nullmailer-2.2-c++11.patch
new file mode 100644
index 00000000000..ac2eb23a338
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-2.2-c++11.patch
@@ -0,0 +1,36 @@
+From f63dcd3d7ec69a7150f305ba81380988e0a1e38d Mon Sep 17 00:00:00 2001
+From: Denis Pronin <dannftk@yandex.ru>
+Date: Tue, 25 Feb 2020 10:06:41 +0300
+Subject: [PATCH] fixed compilation with c++11 standard
+
+Signed-off-by: Denis Pronin <dannftk@yandex.ru>
+---
+ src/inject.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/inject.cc b/src/inject.cc
+index 0a555b2..189a70a 100644
+--- a/src/inject.cc
++++ b/src/inject.cc
+@@ -148,9 +148,10 @@ static bool header_add_to = false;
+ 
+ struct header_field
+ {
++  typedef unsigned length_t;
+   // member information
+   const char* name;
+-  unsigned length;
++  length_t length;
+   bool is_address;
+   bool is_recipient;
+   bool is_sender;
+@@ -204,7 +205,8 @@ struct header_field
+ 
+ #define F false
+ #define T true
+-#define X(N,IA,IR,IS,IRS,R) { #N ":",strlen(#N ":"),\
++#define X(N,IA,IR,IS,IRS,R) { #N ":", \
++  static_cast<header_field::length_t>(strlen(#N ":")),\
+   IA,IR,IS,IRS,R,false, false }
+ static header_field header_fields[] = {
+   // Sender address fields, in order of priority

diff --git a/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild b/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
index 1835317ed6c..53c1cabc06f 100644
--- a/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
+++ b/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-test-racecondition.patch"
 	"${FILESDIR}/${P}-disable-dns-using-test.patch"
 	"${FILESDIR}/${P}-disable-smtp-auth-tests.patch"
+	"${FILESDIR}/${P}-c++11.patch"
 )
 
 pkg_setup() {