From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- mail-mta/nullmailer/files/init.d-nullmailer-r4 | 50 +++++++++++++++++++++ mail-mta/nullmailer/files/init.d-nullmailer-r5 | 51 ++++++++++++++++++++++ mail-mta/nullmailer/files/init.d-nullmailer-r6 | 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 ++++++++++++ mail-mta/nullmailer/files/remotes.sample-2.0 | 30 +++++++++++++ 7 files changed, 256 insertions(+) create mode 100644 mail-mta/nullmailer/files/init.d-nullmailer-r4 create mode 100644 mail-mta/nullmailer/files/init.d-nullmailer-r5 create mode 100644 mail-mta/nullmailer/files/init.d-nullmailer-r6 create mode 100644 mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch create mode 100644 mail-mta/nullmailer/files/nullmailer.service create mode 100644 mail-mta/nullmailer/files/remotes.sample-1.13 create mode 100644 mail-mta/nullmailer/files/remotes.sample-2.0 (limited to 'mail-mta/nullmailer/files') diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r4 b/mail-mta/nullmailer/files/init.d-nullmailer-r4 new file mode 100644 index 000000000000..3a6e049f8257 --- /dev/null +++ b/mail-mta/nullmailer/files/init.d-nullmailer-r4 @@ -0,0 +1,50 @@ +#!/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 new file mode 100644 index 000000000000..38ab1319df52 --- /dev/null +++ b/mail-mta/nullmailer/files/init.d-nullmailer-r5 @@ -0,0 +1,51 @@ +#!/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/init.d-nullmailer-r6 b/mail-mta/nullmailer/files/init.d-nullmailer-r6 new file mode 100644 index 000000000000..2c24f7e0e228 --- /dev/null +++ b/mail-mta/nullmailer/files/init.d-nullmailer-r6 @@ -0,0 +1,51 @@ +#!/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="${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/files/nullmailer-1.13-unistd.h.patch b/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch new file mode 100644 index 000000000000..8199b9627f47 --- /dev/null +++ b/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch @@ -0,0 +1,28 @@ +From 5e9316c669e752fcd9058b28952919bccd967640 Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" +Date: Sat, 31 Jan 2015 23:55:48 +0000 +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 +--- a/lib/fdbuf/fdbuf.h ++++ b/lib/fdbuf/fdbuf.h +@@ -20,6 +20,7 @@ + #include "config.h" + #include + #include ++#include + + #ifdef _REENTRANT + #include diff --git a/mail-mta/nullmailer/files/nullmailer.service b/mail-mta/nullmailer/files/nullmailer.service new file mode 100644 index 000000000000..8aae6c996d13 --- /dev/null +++ b/mail-mta/nullmailer/files/nullmailer.service @@ -0,0 +1,17 @@ +[Unit] +Description=Nullmailer relay-only MTA +Requires=network.target +After=local-fs.target syslog.target +ConditionPathExists=/var/nullmailer/queue +ConditionPathExists=/etc/nullmailer/defaultdomain +ConditionPathExists=/etc/nullmailer/me + +[Service] +WorkingDirectory=/var/nullmailer +ExecStart=/usr/sbin/nullmailer-send -s +User=nullmail +Group=nullmail +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/mail-mta/nullmailer/files/remotes.sample-1.13 b/mail-mta/nullmailer/files/remotes.sample-1.13 new file mode 100644 index 000000000000..d04aee24ecb6 --- /dev/null +++ b/mail-mta/nullmailer/files/remotes.sample-1.13 @@ -0,0 +1,29 @@ +# Format is: HOST PROTOCOL [OPTIONS] +# HOST = IP or DNS +# PROTOCOL = smtp | qmtp +# OPTIONS = [--port=NUMBER] [--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= --pass= +# +# SMTP server supporting AUTH LOGIN +# mailserver smtp --user= --pass= --auth-login +# +# SMTP server with smtps (legacy - use starttls instead) +# mailserver smtp --user= --pass= --port=465 --ssl +# +# SMTP server on submission port with starttls +# mailserver smtp --user= --pass= --port=587 --starttls +# +# SMTP server on submission port with starttls and self-signed certificate +# mailserver smtp --user= --pass= --port=587 --starttls --insecure diff --git a/mail-mta/nullmailer/files/remotes.sample-2.0 b/mail-mta/nullmailer/files/remotes.sample-2.0 new file mode 100644 index 000000000000..59535d691034 --- /dev/null +++ b/mail-mta/nullmailer/files/remotes.sample-2.0 @@ -0,0 +1,30 @@ +# Format is: HOST PROTOCOL [OPTIONS] +# HOST = IP or DNS +# PROTOCOL = smtp | qmtp +# OPTIONS = [port=NUMBER] [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= pass= +# +# SMTP server supporting AUTH LOGIN +# mailserver smtp user= pass= auth-login +# +# SMTP server with smtps (legacy - use starttls instead) +# mailserver smtp user= pass= port=465 ssl +# +# SMTP server on submission port with starttls +# mailserver smtp user= pass= port=587 starttls +# +# SMTP server on submission port with starttls and self-signed certificate +# mailserver smtp user= pass= port=587 starttls insecure + -- cgit v1.2.3