gentoo resync : 13.06.2020

3 files changed, 71 insertions, 4 deletions

diff --git a/app-admin/denyhosts/Manifest b/app-admin/denyhosts/Manifest
index 51b4ac22355b..2d2d7b072467 100644
--- a/app-admin/denyhosts/Manifest
+++ b/app-admin/denyhosts/Manifest
@@ -7,5 +7,6 @@ DIST denyhosts-2.9.tar.gz 49472 BLAKE2B 94f18da3db9dd7e0d979d4fb536160114fe1dc95
 DIST denyhosts-3.0.tar.gz 56283 BLAKE2B 1ecb8a13ec9511cb4ac65579aa8f88117264f231b586c30a61ad9c78abd17aeebc5642e70f162fa7e73fe81a99821d494efca213b1bf864fd0e2043fa4374e6a SHA512 8a1c796c259049ffab2c88cef780b175ec75c94216841421f831dfbf45f4ba0cdbcfbb0e3dab7200aa79eeb2416db5234ad5016d5770d8ab2f28ef4c9754e70d
 EBUILD denyhosts-2.9.ebuild 1858 BLAKE2B cb836ef7bc0d26d96f873d13c3adcd2c6b7f7a86b464ea41bc20ac4165dabc64554fe95e3404c80be89286da66448375450771cfce0415f3ddee873201e411e6 SHA512 bc389dd61b4b0e305284473160bcc16e4f0e4885d83438652280912375a058d3b2e33d1aab65b6a70767bdebe61ff8c6adcab1de8717e89c271fccc72a1d69cf
 EBUILD denyhosts-3.0-r1.ebuild 1762 BLAKE2B 419fdb0a943cd4e6bacb78675cef19ccd6d73709b0a980c8547a01b9d1cc8077992db61553ec46b270e637659f0ffe53509865edb5ff5f3fdb65d3b97ce4b0fc SHA512 b63ffa7964dc8c1b3d659803f2038005aa098a7b62a3022d6aba7fd7716cc271cc2df7424137be0085def3be663b43bf2d1f71b1520be6cd61db14772880b93e
+EBUILD denyhosts-3.0-r2.ebuild 1774 BLAKE2B 1644ee1f25043685d8ed488604167a143d7330653c45313df6abcddaba6d46847d92586d55ca2b2f81f3d2d0dd6deae9ddf8ca2db0f540cacbd5898bc11f99c9 SHA512 0c64f20fdd92e5fcdd4b7d6baf18f849cc6a678cb34b9e1714ab100402d857fc4e6e2f161f41d7fb8dd7b5e506281c5f8695c2c7ab96751e95a7018b666e3be5
 EBUILD denyhosts-3.0.ebuild 1672 BLAKE2B ffce8305ca9db71a456c8163a7bb1fdfcf7187b4433988c93e01f94407dcc0edf577b8d187ad017ff4e357e56d907aa4d34cd4f4d8b292365d46ea2a079be6aa SHA512 660bca4d0ca9fd4eea074cdfde7629d06cb4c6c48f3b0cf9674d6ad62ac931cf51624b67e52862b6b284157643f634495bbce7c6b927bc1b80274ed497a9aad0
-MISC metadata.xml 402 BLAKE2B df1bce989ad8c249f83b5ef00681d455ca645b9160456b615c5a18c1d564d3dff8f6021ed95b9c7ff0d5e6939fe2a99735b4ed16ea8360f021000377f981503b SHA512 0a232a4ee999ce021244cc19ad62e68c962fcfb1cbfda1aef306e6b3376e3944f233cff133c746aedc3f68c60a61511b0a749b434515b705f63d68a034951ed7
+MISC metadata.xml 405 BLAKE2B 78e4aa249eb769b94479816826f18e7005a20cf59f476be51ea5513f6e1a035b3f46ee7fc6c40c7010e07700d9479088f8281b1a84fff47d79d73dd24bc6c954 SHA512 06a687f8daeda5e4d48fcf9887a13f515ef52e47cfad3285c67907d9d17a59d32ce1eaf679b8b8f4f3832295173268cd548a2e493b0663468fb91603b0c6d8ad
diff --git a/app-admin/denyhosts/denyhosts-3.0-r2.ebuild b/app-admin/denyhosts/denyhosts-3.0-r2.ebuild
new file mode 100644
index 000000000000..70da20f43fa6
--- /dev/null
+++ b/app-admin/denyhosts/denyhosts-3.0-r2.ebuild
@@ -0,0 +1,66 @@
+# 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/metadata.xml b/app-admin/denyhosts/metadata.xml
index c193ef3b8e0a..3e89d981c937 100644
--- a/app-admin/denyhosts/metadata.xml
+++ b/app-admin/denyhosts/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
   </maintainer>
   <upstream>
     <remote-id type="github">denyhosts/denyhosts</remote-id>