gentoo resync : 25.04.2020

6 files changed, 154 insertions, 1 deletions

diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest
index cc26286cb9ef..2bcd4bffb22b 100644
--- a/net-misc/endlessh/Manifest
+++ b/net-misc/endlessh/Manifest
@@ -1,7 +1,12 @@
+AUX endlessh-1.1-syslog-help.patch 898 BLAKE2B 97d075e3f0e86f560cc57a2227f15ed88bd2081d0d991e2f420c4f57ab37c3f7302bb56a414ef3a799cbae4eb3e8dfe44706bd755680641fae0b14e2ded9ec59 SHA512 b7681e555afbd12745b0c68f34220451dfe4f9c52fd08401c83197f8b2cd22c14115b5e7d5cf421b56f0fe4b3528903f642557ef8f1a34fabb4dec8901934a2b
 AUX endlessh.confd-r1 1334 BLAKE2B 978cb9746acf2ab5aba7bff766a11daa347daee14bb5d6e03f2dcb8dda4ac8e9394b40aec1acd6ed082d0d4bdbd8fa553793bca10791faa7c99994625dd1f51a SHA512 8f54abdd8d4f63153ed1b1653b52d2e2c4a97b68851a9e8c882e7a0ff6c235300b74ca9803c0eb8402c5c4e6d17977ce77860fa5101d7925ff5004cffca92304
+AUX endlessh.confd-r2 1076 BLAKE2B c25a41bfb71eeaa7b6bdfb4651a1e0d8af91fb1fff6aa1c8edcf31917447d69645d9a00f280d5e7ee88c11c071906d306e916bac72061d5cdcb871f55247752d SHA512 6338bd15f0120936a14aec0b4979fd4422a736e5a5eb7428a5e816cfb0671c24764ba2ce4d6bebfc5488fab18ffd8b02b52f778e0a395891da6352e310135bad
 AUX endlessh.initd-r1 657 BLAKE2B 1954581b2434437d1fbac539a4cf0ee7dd8c59f4eab9a5e7f0f2549ead3ecda062810b9ecbc25b4bd8928e9e0aeea42ff6a0e64be2628313fbaa1a55e1feef11 SHA512 0e7e4306a4b9bfde080647ba82e0f0e4b828a787926d6cc78189a25b0f5d2de4d95433c960f23e4c16ceae0d7cf67a8be69323f04d1911393b88400a9498ba48
+AUX endlessh.initd-r2 762 BLAKE2B c5d89221af1a24bf7d0b45785fa2178dbd6dd70fe12d025f54fbb9c65c2d82a3abf2f2ece1cee30541ba05343984af0318e72f932c171a1de9c4a1e58e2fcf86 SHA512 6ecea923bd9e73a082131bae97bac46b5823828bdbcc8301642c17f7eea3f7231fa1a84e03872e841f64b7ec8b818a03ba993a7b1e87df167434bb1ead4d4c4b
 AUX logrotated-r1 181 BLAKE2B 6667824ccd09b277e1c020c68380061cc40f615b29dd5041fe6c9d2c97a5e434302ef1dae8341bf37f9fbdfe1f12bb73a589c0817dac033714d04ccef337cb8f SHA512 4961f3ea7dabb66a0ba6a650ed21bef9d4bd2289d15d5b3367b31524480d4c63275cedcd2f39202353f302fab6310168529560975b23a8699a2b7a4e6bd4abad
 DIST endlessh-1.0.tar.gz 12258 BLAKE2B add6e24568cc94b244aa52bb484d1516210bfaa5a82440e090a89a94d50fbd4805ae004f917af56a7ad82a6502ae97c059d3f1c24b7c3e13ad1bd5a04bcf1c3e SHA512 a7e4e6ac5dc5e9b6e479ac3323b6a3ecec398ea074970de7794c93bd7a1a77c5662bdfa5752217fe552db1b3dbb9f400183114d7399c5a019637cb40756b46a8
+DIST endlessh-1.1.tar.gz 12844 BLAKE2B 8828739844cb03f67067bb020c3da5b5c6610a195202776da1ae184c0ab02c9f2acef32cc6536bbb80a46242251e3425eed2c70b0d1a90b0e73696ac14babc94 SHA512 7df2463425ad1417a2e328eacfb840aed14727168b83b5adf80cf6c5c98a6fc05f96bba9257b543ef60202a74383e4978e92c4a1b959e35d4ab94e0e5bda14fd
 EBUILD endlessh-1.0.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
+EBUILD endlessh-1.1.ebuild 1276 BLAKE2B c08eb57ea3dedf5799c3f7e798ed19e615383d67a84b745326982a317435706c2487c5c077296e36ce3b9814bd45f271837cb894fabefbe58c039df2dc1163e2 SHA512 dbabc4140515ddcf131916f3e40e1cf6d046dd6ff9825e777b317611e9a02a52c7e977c969275931872486be9548efb9d2842ee49723f0c67f6ae59cc4bde9a3
 EBUILD endlessh-9999.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
-MISC metadata.xml 931 BLAKE2B 0796a43cb19ba6da07434a782da24ab45e216a547042c598c9c7e090e5ceaffa7a69ddbe4e3466eeaf7e4d14d0bb3b8457d0db45b74d675f31a17bad281b1a7e SHA512 adeb45ea9169f3c9c52e2131ea51b2b357c3f036edc28baa1fd312ab58313d4208cfd75f01fa39e2fd045d6587d9167a76e530245c0d650a27c50fcf2c2e3410
+MISC metadata.xml 1031 BLAKE2B 8f3ec618c1142bbea8f7bc995b0630dedba8391b1b52045f24f3636418bdbdb3a9368e442b177915db8e77291af3c73bb2ee7ad7e3ad596916bcdfde14034ef2 SHA512 2cb9ee586abf06930aa03eb3a536c15d22114a5d3c42c15037cac9f6df6a289bdadcfd83b87f75869be49c22486c11c1e425f67bd982289be0f6130bfb828cbf
diff --git a/net-misc/endlessh/endlessh-1.1.ebuild b/net-misc/endlessh/endlessh-1.1.ebuild
new file mode 100644
index 000000000000..d4fc3553bf59
--- /dev/null
+++ b/net-misc/endlessh/endlessh-1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="SSH tarpit that slowly sends and endless banner"
+HOMEPAGE="https://github.com/skeeto/endlessh"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
+else
+	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="Unlicense"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND=""
+
+src_prepare() {
+	default
+
+	tc-export CC
+
+	sed -i \
+		-e 's/^CC/CC?/' \
+		-e 's/^CFLAGS  =/CFLAGS  +=/' \
+		-e 's/ -Os//' \
+		-e 's/^LDFLAGS/LDFLAGS?/' \
+		-e 's/^PREFIX/PREFIX?/' \
+		Makefile || die
+
+	sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \
+		util/endlessh.service || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/endlessh.initd-r2 endlessh
+	newconfd "${FILESDIR}"/endlessh.confd-r2 endlessh
+
+	systemd_dounit util/endlessh.service
+
+	insinto /usr/share/"${PN}"
+	doins util/{pivot.py,schema.sql}
+}
+
+pkg_postinst() {
+	elog "Log parsing script installed to ${EPREFIX}/usr/share/${PN}"
+	elog "Install dev-python/pyrfc3339 if you are going to use it"
+}
diff --git a/net-misc/endlessh/files/endlessh-1.1-syslog-help.patch b/net-misc/endlessh/files/endlessh-1.1-syslog-help.patch
new file mode 100644
index 000000000000..ec87997d2f23
--- /dev/null
+++ b/net-misc/endlessh/files/endlessh-1.1-syslog-help.patch
@@ -0,0 +1,24 @@
+From 3643683c20774afa1606bae5f1c4ccbfd2a905db Mon Sep 17 00:00:00 2001
+From: "Sam James (sam_c)" <sam@cmpct.info>
+Date: Tue, 21 Apr 2020 08:09:49 +0000
+Subject: [PATCH] Add -s (syslog) to help output
+
+Signed-off-by: Sam James (sam_c) <sam@cmpct.info>
+---
+ endlessh.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/endlessh.c b/endlessh.c
+index adb8ad3..8c3afff 100644
+--- a/endlessh.c
++++ b/endlessh.c
+@@ -530,6 +530,8 @@ usage(FILE *f)
+     fprintf(f, "  -m INT    Maximum number of clients ["
+             XSTR(DEFAULT_MAX_CLIENTS) "]\n");
+     fprintf(f, "  -p INT    Listening port [" XSTR(DEFAULT_PORT) "]\n");
++    fprintf(f, "  -s        Print diagnostics to syslog instead of "
++            "standard output\n");
+     fprintf(f, "  -v        Print diagnostics to standard output "
+             "(repeatable)\n");
+     fprintf(f, "  -V        Print version information and exit\n");
+
diff --git a/net-misc/endlessh/files/endlessh.confd-r2 b/net-misc/endlessh/files/endlessh.confd-r2
new file mode 100644
index 000000000000..062e30f0c164
--- /dev/null
+++ b/net-misc/endlessh/files/endlessh.confd-r2
@@ -0,0 +1,29 @@
+# /etc/conf.d/endlessh: config file for /etc/init.d/endlessh
+#
+#default options used by init.d if this is unset
+#ENDLESSH_ARGS="-sv"
+#
+#Usage: endlessh [-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: by default is syslog
+# You can add -v (or -vv) for verbosity
+#ENDLESSH_ARGS="-s -v"
diff --git a/net-misc/endlessh/files/endlessh.initd-r2 b/net-misc/endlessh/files/endlessh.initd-r2
new file mode 100644
index 000000000000..0b995f683d91
--- /dev/null
+++ b/net-misc/endlessh/files/endlessh.initd-r2
@@ -0,0 +1,30 @@
+#!/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"
+# NOTE: You will need to add -s to ENDLESSH_ARGS in /etc/conf.d/endlessh if modified to keep syslog
+command_args="${ENDLESSH_ARGS:--sv}"
+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/metadata.xml b/net-misc/endlessh/metadata.xml
index 98a449ec2b7c..98e3367dc981 100644
--- a/net-misc/endlessh/metadata.xml
+++ b/net-misc/endlessh/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>sam@cmpct.info</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>