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

[Aaron Bauman]

commit:     29c0ba389640c6f4e75443dc3aaa89d89da59298
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri May 22 08:08:45 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 04:27:35 2020 +0000
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 <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15911
Signed-off-by: Aaron Bauman <bman <AT> 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..00000000000
--- 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..00000000000
--- 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..00000000000
--- 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" <blueness@g.o>
-Date: Sat, 31 Jan 2015 23:55:48 +0000
-Subject: [PATCH] lib/fdbuf/fdbuf.h: include <unistd.h>
-
-class fdobuf in lib/fdbuf/fdobuf.h makes use of uid_t and gid_t,
-but these are defined in <unistd.h> according to POSIX.  With libc's
-that adhere strictly to standards, like musl, this breaks the build.
-
-We add <unistd.h> to fdbuf.h which is included by fdbuf.h.
-
-Signed-off-by: Anthony G. Basile <blueness@g.o>
----
- 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 <string.h>
- #include <fcntl.h>
-+#include <unistd.h>
- 
- #ifdef _REENTRANT
- #include <pthread.h>

diff --git a/mail-mta/nullmailer/files/nullmailer.service b/mail-mta/nullmailer/files/nullmailer.service
deleted file mode 100644
index 8aae6c996d1..00000000000
--- a/mail-mta/nullmailer/files/nullmailer.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[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
deleted file mode 100644
index d04aee24ecb..00000000000
--- a/mail-mta/nullmailer/files/remotes.sample-1.13
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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=<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