[gentoo-commits] repo/gentoo:master commit in: mail-mta/nullmailer/files/, mail-mta/nullmailer/
commit: a9fee5c109c671e034d31127ea59d988ab15f5fb
Author: Theo Anderson posteo de>
AuthorDate: Sun Jan 17 10:25:02 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Jun 15 06:02:06 2021 +
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 posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/19088
Signed-off-by: Joonas Niilola 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 000..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
+Date: Tue, 25 Feb 2020 10:06:41 +0300
+Subject: [PATCH] fixed compilation with c++11 standard
+
+Signed-off-by: Denis Pronin
+---
+ 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(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() {
[gentoo-commits] repo/gentoo:master commit in: mail-mta/nullmailer/files/
commit: 29c0ba389640c6f4e75443dc3aaa89d89da59298
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Fri May 22 08:08:45 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Tue Jun 2 04:27:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c0ba38
mail-mta/nullmailer: remove unused patch and files
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15911
Signed-off-by: Aaron Bauman gentoo.org>
mail-mta/nullmailer/files/init.d-nullmailer-r4 | 50 -
mail-mta/nullmailer/files/init.d-nullmailer-r5 | 51 --
.../files/nullmailer-1.13-unistd.h.patch | 28
mail-mta/nullmailer/files/nullmailer.service | 17
mail-mta/nullmailer/files/remotes.sample-1.13 | 29
5 files changed, 175 deletions(-)
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r4
b/mail-mta/nullmailer/files/init.d-nullmailer-r4
deleted file mode 100644
index 3a6e049f825..000
--- a/mail-mta/nullmailer/files/init.d-nullmailer-r4
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-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"
-command_args="-s"
-
-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/files/init.d-nullmailer-r5
b/mail-mta/nullmailer/files/init.d-nullmailer-r5
deleted file mode 100644
index 38ab1319df5..000
--- a/mail-mta/nullmailer/files/init.d-nullmailer-r5
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-command="/usr/sbin/nullmailer-send"
-
-start_stop_daemon_args="--chdir /var/spool/nullmailer --user nullmail:nullmail"
-start_stop_daemon_args+=" --stdout /var/log/nullmailer/nullmailer.log"
-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/files/nullmailer-1.13-unistd.h.patch
b/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch
deleted file mode 100644
index 8199b9627f4..000
--- a/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5e9316c669e752fcd9058b28952919bccd967640 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile"
-Date: Sat, 31 Jan 2015 23:55:48 +
-Subject: [PATCH] lib/fdbuf/fdbuf.h: include
-
-class fdobuf in lib/fdbuf/fdobuf.h makes use of uid_t and gid_t,
-but these are defined in according to POSIX. With libc's
-that adhere strictly to standards, like musl, this breaks the build.
-
-We add to fdbuf.h which is included by fdbuf.h.
-
-Signed-off-by: Anthony G. Basile
- lib/fdbuf/fdbuf.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/fdbuf/fdbuf.h b/lib/fdbuf/fdbuf.h
-index 4b0e9cb..0054b01 100644
[gentoo-commits] repo/gentoo:master commit in: mail-mta/nullmailer/files/, mail-mta/nullmailer/
commit: 1121a40affec68c6a41cf77bcabce065aed584f2 Author: Michael Haubenwallner gentoo org> AuthorDate: Tue Oct 1 12:34:59 2019 + Commit: Michael Haubenwallner gentoo org> CommitDate: Tue Oct 1 12:39:37 2019 + 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 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 000..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 +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 000..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 +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
[gentoo-commits] repo/gentoo:master commit in: mail-mta/nullmailer/files/, mail-mta/nullmailer/
commit: 3ba4e746c3e6ec10fbb8df1b385b4e9ca85978df
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Nov 26 14:49:09 2016 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Nov 26 14:49:18 2016 +
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 ..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 ..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
