[gentoo-commits] repo/gentoo:master commit in: app-admin/denyhosts/, profiles/, app-admin/denyhosts/files/

[Michał Górny]

commit:     fbf8bbf4d181709547432aa13b6c8c2be7187f47
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 13:18:45 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 13:18:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf8bbf4

app-admin/denyhosts: Remove last-rited pkg

Closes: https://bugs.gentoo.org/732076
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/denyhosts/Manifest                       |  1 -
 app-admin/denyhosts/denyhosts-3.0-r1.ebuild        | 66 ----------------------
 app-admin/denyhosts/denyhosts-3.0-r2.ebuild        | 66 ----------------------
 .../denyhosts/files/denyhosts-3.0-python2.7.patch  | 51 -----------------
 app-admin/denyhosts/files/denyhosts.init-r2        | 27 ---------
 app-admin/denyhosts/files/denyhosts.logrotate-r2   | 10 ----
 app-admin/denyhosts/files/denyhosts.service        | 12 ----
 app-admin/denyhosts/metadata.xml                   |  9 ---
 profiles/package.mask                              |  6 --
 9 files changed, 248 deletions(-)

diff --git a/app-admin/denyhosts/Manifest b/app-admin/denyhosts/Manifest
deleted file mode 100644
index 46ed157092a..00000000000
--- a/app-admin/denyhosts/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST denyhosts-3.0.tar.gz 56283 BLAKE2B 1ecb8a13ec9511cb4ac65579aa8f88117264f231b586c30a61ad9c78abd17aeebc5642e70f162fa7e73fe81a99821d494efca213b1bf864fd0e2043fa4374e6a SHA512 8a1c796c259049ffab2c88cef780b175ec75c94216841421f831dfbf45f4ba0cdbcfbb0e3dab7200aa79eeb2416db5234ad5016d5770d8ab2f28ef4c9754e70d

diff --git a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
deleted file mode 100644
index 287529f92f3..00000000000
--- a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eutils readme.gentoo-r1 systemd
-
-DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
-HOMEPAGE="https://github.com/denyhosts/denyhosts"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
->=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
-(see bug#531156) that means you either have patch openssh or use
-denyhosts' iptables feature to get any protection.
-
-You can configure DenyHosts to run as a daemon by running:
-# rc-update add denyhosts default
-or:
-# systemctl enable denyhosts.service
-(if you use systemd)
-
-To run DenyHosts as a cronjob instead of a daemon add the following
-to /etc/crontab
-# run DenyHosts every 10 minutes
-*/10  *  * * *    root    /usr/bin/denyhosts.py -c /etc/denyhosts.conf
-
-More information can be found at ${HOMEPAGE}faq.html"
-
-#bring back python-2.7 support  bug #577502
-PATCHES=( "${FILESDIR}"/"${P}"-python2.7.patch )
-
-src_prepare() {
-	sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
-		-e '/^SECURE_LOG/s/^/#/' \
-		-e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
-		-i denyhosts.conf || die "sed failed"
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	readme.gentoo_create_doc
-
-	dodoc CHANGELOG.txt README.md
-	distutils-r1_src_install
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
-
-	newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	keepdir /var/lib/denyhosts
-}

diff --git a/app-admin/denyhosts/denyhosts-3.0-r2.ebuild b/app-admin/denyhosts/denyhosts-3.0-r2.ebuild
deleted file mode 100644
index 70da20f43fa..00000000000
--- a/app-admin/denyhosts/denyhosts-3.0-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 eutils readme.gentoo-r1 systemd
-
-DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
-HOMEPAGE="https://github.com/denyhosts/denyhosts"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
->=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
-(see bug#531156) that means you either have patch openssh or use
-denyhosts' iptables feature to get any protection.
-
-You can configure DenyHosts to run as a daemon by running:
-# rc-update add denyhosts default
-or:
-# systemctl enable denyhosts.service
-(if you use systemd)
-
-To run DenyHosts as a cronjob instead of a daemon add the following
-to /etc/crontab
-# run DenyHosts every 10 minutes
-*/10  *  * * *    root    /usr/bin/denyhosts.py -c /etc/denyhosts.conf
-
-More information can be found at ${HOMEPAGE}faq.html"
-
-#bring back python-2.7 support  bug #577502
-PATCHES=( "${FILESDIR}"/"${P}"-python2.7.patch )
-
-src_prepare() {
-	sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
-		-e '/^SECURE_LOG/s/^/#/' \
-		-e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
-		-i denyhosts.conf || die "sed failed"
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	readme.gentoo_create_doc
-
-	dodoc CHANGELOG.txt README.md
-	distutils-r1_src_install
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
-
-	newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	keepdir /var/lib/denyhosts
-}

diff --git a/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch b/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch
deleted file mode 100644
index 4b727c7067d..00000000000
--- a/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b5611dfa0510ec8fbaa2db4b6834d0bd7ecf0909 Mon Sep 17 00:00:00 2001
-From: Jesse <jessefrgsmith@×××××.ca>
-Date: Sat, 27 Jun 2015 20:24:44 -0300
-Subject: [PATCH] Fixed a type check which was causing syntax/undefined errors
- in DenyHosts/report.py when switching between Python2 and Python3.
-
----
- CHANGELOG.txt       | 8 ++++++++
- DenyHosts/report.py | 4 +++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/CHANGELOG.txt b/CHANGELOG.txt
-index ca173cb..b585332 100644
---- a/CHANGELOG.txt
-+++ b/CHANGELOG.txt
-@@ -1,5 +1,13 @@
- DENYHOSTS CHANGELOG
- 
-+3.1
-+======================
-+
-+Fixed a type check in DenyHosts/report.py which was causing
-+problems when moving between Python2 and Python3.
-+
-+
-+
- 3.0
- ======================
- 
-diff --git a/DenyHosts/report.py b/DenyHosts/report.py
-index 05f3e3d..9560eab 100644
---- a/DenyHosts/report.py
-+++ b/DenyHosts/report.py
-@@ -3,6 +3,7 @@
- import socket
- # Removing this as it causes runtime errors on Python3.4
- # from types import ListType, TupleType
-+import types
- from .util import is_true
- try:
-     import syslog
-@@ -38,7 +39,8 @@ def get_report(self):
-     def add_section(self, message, iterable):
-         self.report += "%s:\n\n" % message
-         for i in iterable:
--            if type(i) in (TupleType, ListType):
-+            # if type(i) in (TupleType, ListType):
-+            if (type(i) is types.ListType) or (type(i) is types.TupleType):
-                 extra = ": %d\n" % i[1]
-                 i = i[0]
-             else:

diff --git a/app-admin/denyhosts/files/denyhosts.init-r2 b/app-admin/denyhosts/files/denyhosts.init-r2
deleted file mode 100644
index 9b2f24cbf21..00000000000
--- a/app-admin/denyhosts/files/denyhosts.init-r2
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_stopped_commands="purge"
-
-purge() {
-	ebegin "Purging hosts.deny"
-	start-stop-daemon --start --exec /usr/bin/denyhosts.py --pidfile /var/run/denyhosts.pid -- --purge
-	eend $?
-}
-
-depend() {
-	use logger sshd
-}
-
-start() {
-	ebegin "Starting DenyHosts daemon"
-	start-stop-daemon --start --exec /usr/bin/denyhosts.py --pidfile /var/run/denyhosts.pid -- --daemon -c /etc/denyhosts.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping DenyHosts daemon"
-	start-stop-daemon --quiet --stop --pidfile /var/run/denyhosts.pid
-	eend $?
-}

diff --git a/app-admin/denyhosts/files/denyhosts.logrotate-r2 b/app-admin/denyhosts/files/denyhosts.logrotate-r2
deleted file mode 100644
index 582e72f7a36..00000000000
--- a/app-admin/denyhosts/files/denyhosts.logrotate-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/denyhosts {
-	missingok
-	notifempty
-	create 0640 root root
-	sharedscripts
-	postrotate
-		test -e /run/openrc/softlevel && /etc/init.d/denyhosts restart 1>/dev/null || true
-		test -e /run/systemd/system && systemctl restart denyhosts >/dev/null || true
-	endscript
-}

diff --git a/app-admin/denyhosts/files/denyhosts.service b/app-admin/denyhosts/files/denyhosts.service
deleted file mode 100644
index 05a59dd27bf..00000000000
--- a/app-admin/denyhosts/files/denyhosts.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=SSH log watcher
-Before=sshd.service
-
-[Service]
-Type=forking
-ExecStartPre=/bin/rm -f /var/run/denyhosts.pid
-ExecStart=/usr/bin/denyhosts.py --daemon --config=/etc/denyhosts.conf
-PIDFile=/var/run/denyhosts.pid
-
-[Install]
-WantedBy=multi-user.target

diff --git a/app-admin/denyhosts/metadata.xml b/app-admin/denyhosts/metadata.xml
deleted file mode 100644
index 463b166d585..00000000000
--- a/app-admin/denyhosts/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">denyhosts/denyhosts</remote-id>
-    <remote-id type="sourceforge">denyhost</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index bd0ba20a88a..97654d0cd0e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -760,12 +760,6 @@ dev-ruby/zeitwerk:1
 ~virtual/perl-Time-Piece-1.340.100
 ~virtual/perl-Unicode-Normalize-1.270.0
 
-# Christoph Junghans <junghans@g.o> (2020-07-14)
-# Unmaintained upstream and does not support systemd or firewalld.
-# Please use net-analyzer/fail2ban instead. (bug #732076)
-# Removal in 30 days.
-app-admin/denyhosts
-
 # William Hubbs <williamh@g.o> (2020-07-14)
 # The kubernetes split packages are old versions with known security
 # issues.