gentoo resync : 22.06.2019

6 files changed, 1 insertions, 130 deletions

diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest
index 9197f18a438e..d111f5fc72b1 100644
--- a/net-misc/endlessh/Manifest
+++ b/net-misc/endlessh/Manifest
@@ -1,12 +1,7 @@
-AUX endlessh.confd 822 BLAKE2B d7f7810d80dfdf6d7f71119304b161d82ddc1852e76084a5bff494111c0a7b53aae34cbc9eb63300ff7eb02aa01da393e50b5b38551d8e355527e687a3a3d941 SHA512 d8e83846e7adff478c4cb2f238a8363cec54c43cb6fb25445f88fdba256b35c60cce71b546354667d411cb8b08421533f2e3b35a9136243d09bd66c2b7e1d0f3
 AUX endlessh.confd-r1 1334 BLAKE2B 978cb9746acf2ab5aba7bff766a11daa347daee14bb5d6e03f2dcb8dda4ac8e9394b40aec1acd6ed082d0d4bdbd8fa553793bca10791faa7c99994625dd1f51a SHA512 8f54abdd8d4f63153ed1b1653b52d2e2c4a97b68851a9e8c882e7a0ff6c235300b74ca9803c0eb8402c5c4e6d17977ce77860fa5101d7925ff5004cffca92304
-AUX endlessh.initd 467 BLAKE2B 008886697a897f0ed3ea6a58c5d3b805364cbfa7084e7b871e5acfe27d3078434254c3da95ae31398598662521ad456377fc31160a2e00f3afbd7c0308a8948d SHA512 c0e2133d4edaf09af46fb739b89ae066c773300e48f9de82ec54eeec116e239c568342200cf250773eefb69765c8fe6ae508ff7643f3a15a26a6a7ec6ccdada6
 AUX endlessh.initd-r1 657 BLAKE2B 1954581b2434437d1fbac539a4cf0ee7dd8c59f4eab9a5e7f0f2549ead3ecda062810b9ecbc25b4bd8928e9e0aeea42ff6a0e64be2628313fbaa1a55e1feef11 SHA512 0e7e4306a4b9bfde080647ba82e0f0e4b828a787926d6cc78189a25b0f5d2de4d95433c960f23e4c16ceae0d7cf67a8be69323f04d1911393b88400a9498ba48
-AUX logrotated 133 BLAKE2B 56d8c2e32bdae751326a8cf22f5369abda80df8478001398fcb8675fb5ac257beed06a13894ffd713606ca4697068becd36916bbe058e2c45c5b70c724d30673 SHA512 4ac4c0bbaf7658a844ace9727cfa459716f67c6f5705f5ee3b21c01fe5a21ed4083ed4b40966c3ec5392cb5d6491b0e3480bef18b1b4afd1dd10fd9e1052411a
 AUX logrotated-r1 181 BLAKE2B 6667824ccd09b277e1c020c68380061cc40f615b29dd5041fe6c9d2c97a5e434302ef1dae8341bf37f9fbdfe1f12bb73a589c0817dac033714d04ccef337cb8f SHA512 4961f3ea7dabb66a0ba6a650ed21bef9d4bd2289d15d5b3367b31524480d4c63275cedcd2f39202353f302fab6310168529560975b23a8699a2b7a4e6bd4abad
-DIST endlessh-0.1.tar.gz 8566 BLAKE2B e8fefd6ef80d26c25f57ffe1cef502af05322e348d63ca17c0bb626e35d5c1d35cb98384b35c86c579f2876573f4c13468605c3f44325a48d19e27c499657853 SHA512 0d11c82a708a26bd77ca85f7f3bd0eda2807ded9de88e3e518da09a38b3e94fc2658ea6f210e4f1493d38ca5948968c5488c8f2f09ff2adf22b799622b4952b8
 DIST endlessh-1.0.tar.gz 12258 BLAKE2B add6e24568cc94b244aa52bb484d1516210bfaa5a82440e090a89a94d50fbd4805ae004f917af56a7ad82a6502ae97c059d3f1c24b7c3e13ad1bd5a04bcf1c3e SHA512 a7e4e6ac5dc5e9b6e479ac3323b6a3ecec398ea074970de7794c93bd7a1a77c5662bdfa5752217fe552db1b3dbb9f400183114d7399c5a019637cb40756b46a8
-EBUILD endlessh-0.1.ebuild 1316 BLAKE2B 8363adff4cd74f9d4dad3b767da1740d6d4a899e574e9aeb44302a9362f42d4d5f84246dc7b631a563bad75030c8971800b31b4c78553eb3e64574b26e5c9e86 SHA512 040568eff0cb04c7a5158aa8c8dd0e653cfff19bb69f43649cbc0efc7017260bd0335794a94b1094f8dc9e363bedf6ef09f2184ea014cbd7565f566ba7da66e3
 EBUILD endlessh-1.0.ebuild 1336 BLAKE2B 633542e55f0676a2747ce98dd0f4d61b440ebfbddd4403133a2369d48d516e79dca7b9299f7af4fed9cb178707bf7eba0d10157ef803ade97dd070a81ab3f806 SHA512 211e5c05d1d6b14640fe916bce38f20df433eb981f3d5ad02e88ee49d890b0e31231ae6a5fa62cecd9f04cb692c3ad3805c1a308e41eb399c32f0a4b6e792e42
 EBUILD endlessh-9999.ebuild 1336 BLAKE2B 633542e55f0676a2747ce98dd0f4d61b440ebfbddd4403133a2369d48d516e79dca7b9299f7af4fed9cb178707bf7eba0d10157ef803ade97dd070a81ab3f806 SHA512 211e5c05d1d6b14640fe916bce38f20df433eb981f3d5ad02e88ee49d890b0e31231ae6a5fa62cecd9f04cb692c3ad3805c1a308e41eb399c32f0a4b6e792e42
-MISC metadata.xml 1075 BLAKE2B 5ec84e340815f31671568a185d52e217d4b5818f3a1a1f64860c35e484ca5f8d08d714d8eea5111c6eb8067845a537a8271864e68713c889fc22d7c4024fee30 SHA512 1d63706f79e1eea43482dd83d9b0e11cb2b0693fd9ebf39f9d3f2427ecf8d081800d9861965b4eb6428f54f35c6d58c9eeeba952edb610c10f842ce5bb326ada
+MISC metadata.xml 931 BLAKE2B 0796a43cb19ba6da07434a782da24ab45e216a547042c598c9c7e090e5ceaffa7a69ddbe4e3466eeaf7e4d14d0bb3b8457d0db45b74d675f31a17bad281b1a7e SHA512 adeb45ea9169f3c9c52e2131ea51b2b357c3f036edc28baa1fd312ab58313d4208cfd75f01fa39e2fd045d6587d9167a76e530245c0d650a27c50fcf2c2e3410
diff --git a/net-misc/endlessh/endlessh-0.1.ebuild b/net-misc/endlessh/endlessh-0.1.ebuild
deleted file mode 100644
index 105c786b1013..000000000000
--- a/net-misc/endlessh/endlessh-0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-single-r1 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 ~x86"
-fi
-
-LICENSE="Unlicense"
-SLOT="0"
-IUSE="tools"
-REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	tools? (
-		${PYTHON_DEPS}
-		dev-db/sqlite
-		dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND=""
-
-pkg_setup() {
-	use tools && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	tc-export CC
-
-	sed -i \
-		-e 's/^CC/CC?/' \
-		-e 's/^CFLAGS  =/CFLAGS  +=/' \
-		-e 's/ -Os//' \
-		-e 's/^LDFLAGS/LDFLAGS?/' \
-		Makefile || die
-
-	sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \
-		util/endlessh.service || die
-}
-
-src_install() {
-	dobin endlessh
-
-	newinitd "${FILESDIR}"/endlessh.initd endlessh
-	newconfd "${FILESDIR}"/endlessh.confd endlessh
-
-	systemd_dounit util/endlessh.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotated" endlessh
-
-	einstalldocs
-}
diff --git a/net-misc/endlessh/files/endlessh.confd b/net-misc/endlessh/files/endlessh.confd
deleted file mode 100644
index a114889c8cac..000000000000
--- a/net-misc/endlessh/files/endlessh.confd
+++ /dev/null
@@ -1,22 +0,0 @@
-# /etc/conf.d/endlessh: config file for /etc/init.d/endlessh
-#
-#ENDLESSH_ARGS=""
-#
-#  -d INT    Message millisecond delay [10000]
-#  -f        Set and load config file [/etc/endlessh/config]
-#  -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)
-
-# EXAMPLE: listen on port 22, log all queries and errors in very verbose mode
-
-#ENDLESSH_ARGS="-p 22 -vv"
-
-# 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 b/net-misc/endlessh/files/endlessh.initd
deleted file mode 100755
index a88fd9c34c90..000000000000
--- a/net-misc/endlessh/files/endlessh.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	use net
-}
-
-description="Starts endlessh tarpit"
-
-command="/usr/bin/endlessh"
-command_args="${ENDLESSH_ARGS}"
-command_background="true"
-extra_started_commands="reload"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-reload() {
-	ebegin "Reloading ${RC_SVCNAME} configuration"
-	start-stop-daemon --exec $command --signal HUP
-	eend $?
-}
diff --git a/net-misc/endlessh/files/logrotated b/net-misc/endlessh/files/logrotated
deleted file mode 100644
index 53c9efbfe873..000000000000
--- a/net-misc/endlessh/files/logrotated
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/endlessh.log /var/log/endlessh.error.log {
-	missingok
-	notifempty
-	postrotate
-		/etc/init.d/endlessh -q reload
-	endscript
-}
diff --git a/net-misc/endlessh/metadata.xml b/net-misc/endlessh/metadata.xml
index 10db1a22fbfe..98a449ec2b7c 100644
--- a/net-misc/endlessh/metadata.xml
+++ b/net-misc/endlessh/metadata.xml
@@ -17,7 +17,4 @@
 	<upstream>
 		<remote-id type="github">skeeto/endlessh</remote-id>
 	</upstream>
-	<use>
-		<flag name="tools">Install additional python script which can be used to parse logs and save summary to sqlite database</flag>
-	</use>
 </pkgmetadata>