gentoo resync : 29.06.2020

5 files changed, 1 insertions, 73 deletions

diff --git a/net-misc/endlessh/files/endlessh.confd-r2 b/net-misc/endlessh/files/endlessh.confd
index 062e30f0c164..062e30f0c164 100644
--- a/net-misc/endlessh/files/endlessh.confd-r2
+++ b/net-misc/endlessh/files/endlessh.confd
diff --git a/net-misc/endlessh/files/endlessh.confd-r1 b/net-misc/endlessh/files/endlessh.confd-r1
deleted file mode 100644
index 13ba0ef55d2e..000000000000
--- a/net-misc/endlessh/files/endlessh.confd-r1
+++ /dev/null
@@ -1,34 +0,0 @@
-# /etc/conf.d/endlessh: config file for /etc/init.d/endlessh
-#
-#ENDLESSH_ARGS=""
-# Usage: [-vh] [-46] [-d MS] [-f CONFIG] [-l LEN] [-m LIMIT] [-p PORT]
-#   -4        Bind to IPv4 only
-#   -6        Bind to IPv6 only
-#   -d INT    Message millisecond delay [10000]
-#   -f        Set and load config file [/etc/endlessh/config]
-#   -h        Print this help message and exit
-#   -l INT    Maximum banner line length (3-255) [32]
-#   -m INT    Maximum number of clients [4096]
-#   -p INT    Listening port [2222]
-#   -v        Print diagnostics to standard output (repeatable)
-#   -V        Print version information and exit
-
-# EXAMPLE 1: listen on port 22, log all queries and errors in very verbose mode
-#ENDLESSH_ARGS="-p 22 -vv"
-
-# EXAMPLE 2: load settings from config file
-#ENDLESSH_ARGS="-f /etc/endlessh/config"
-
-# EXAMPLE 3: load settings from config file, but override port
-#ENDLESSH_ARGS="-f /etc/endlessh/config -p 22"
-
-
-# LOGGING: is disabled by default, enable this to actually redirect messages
-
-# plain file (preferred), change logrotate file as well if you change this.
-#output_log=/var/log/"${RC_SVCNAME}.log"
-#error_log=/var/log/"${RC_SVCNAME}.error.log"
-
-# syslog support via LOGGER(1). Note this spawns logger processes per io stream
-#output_logger="logger -p daemon.none --"
-#error_logger="logger -p daemon.err --"
diff --git a/net-misc/endlessh/files/endlessh.initd-r2 b/net-misc/endlessh/files/endlessh.initd
index 0b995f683d91..1639c57348c4 100644
--- a/net-misc/endlessh/files/endlessh.initd-r2
+++ b/net-misc/endlessh/files/endlessh.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
diff --git a/net-misc/endlessh/files/endlessh.initd-r1 b/net-misc/endlessh/files/endlessh.initd-r1
deleted file mode 100644
index ea8d830af439..000000000000
--- a/net-misc/endlessh/files/endlessh.initd-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	after bootmisc
-	need localmount
-	use clock logger net
-}
-
-description="Starts endlessh tarpit"
-
-command="/usr/bin/endlessh"
-command_args="${ENDLESSH_ARGS}"
-command_background="true"
-extra_started_commands="dumpstats reload"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-dumpstats() {
-	ebegin "Dumping connection stats of ${RC_SVCNAME} to log"
-	start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${RC_SVCNAME} configuration"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
diff --git a/net-misc/endlessh/files/logrotated-r1 b/net-misc/endlessh/files/logrotated-r1
deleted file mode 100644
index 896e89e6474f..000000000000
--- a/net-misc/endlessh/files/logrotated-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/endlessh.log /var/log/endlessh.error.log {
-	copytruncate
-	missingok
-	notifempty
-	sharedscripts
-	prerotate
-		/etc/init.d/endlessh --ifstarted --quiet dumpstats
-	endscript
-}