From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-admin/denyhosts/Manifest | 11 ++++ app-admin/denyhosts/denyhosts-2.9.ebuild | 72 ++++++++++++++++++++++ app-admin/denyhosts/denyhosts-3.0-r1.ebuild | 66 ++++++++++++++++++++ app-admin/denyhosts/denyhosts-3.0.ebuild | 63 +++++++++++++++++++ .../denyhosts/files/denyhosts-2.6-hostname.patch | 21 +++++++ .../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 | 12 ++++ 10 files changed, 345 insertions(+) create mode 100644 app-admin/denyhosts/Manifest create mode 100644 app-admin/denyhosts/denyhosts-2.9.ebuild create mode 100644 app-admin/denyhosts/denyhosts-3.0-r1.ebuild create mode 100644 app-admin/denyhosts/denyhosts-3.0.ebuild create mode 100644 app-admin/denyhosts/files/denyhosts-2.6-hostname.patch create mode 100644 app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch create mode 100644 app-admin/denyhosts/files/denyhosts.init-r2 create mode 100644 app-admin/denyhosts/files/denyhosts.logrotate-r2 create mode 100644 app-admin/denyhosts/files/denyhosts.service create mode 100644 app-admin/denyhosts/metadata.xml (limited to 'app-admin/denyhosts') diff --git a/app-admin/denyhosts/Manifest b/app-admin/denyhosts/Manifest new file mode 100644 index 000000000000..be8728e24df4 --- /dev/null +++ b/app-admin/denyhosts/Manifest @@ -0,0 +1,11 @@ +AUX denyhosts-2.6-hostname.patch 664 BLAKE2B b86f74d9eee9e47f96a1894eda227d0c437d45e4d2615d14f350179245a953022d3dd6e401babf6b9474092c77362f6aa56b1ec51b57310b5fed75d843945703 SHA512 0fc512f4a1691a90aba7d95b4757a363f3ff6bb893fdc719277c5dbec1904828be923f5ab21c5ba20e03a5e6bf61a5f7d35c6675b9ccfafd32dbd9e108dd5095 +AUX denyhosts-3.0-python2.7.patch 1502 BLAKE2B 7057613a62ebe718a6712e06b4ef1b3c875a644380ef97398cc9c2dd4d7e84d8887d3783cc853aaa7d04d97bf05bdb6f0929b2eb4a72d20ca5e63369bed22e04 SHA512 ee3c4f7f6a8126e4a9c30531cce2673f8c0eb4c4d2a011aa22a3aa4f0b9ee58f8278334cf9253619d999b8dadf4370d6c02f2535a0b6d794243e3050f3927e8f +AUX denyhosts.init-r2 646 BLAKE2B b52a481376656aab7525e3f04ea7712137c132605e62e011f41b8c006341e223487a4702e7aa8dd8f2a1faa6f52d33937557eb2bc130c97c6e9e2333cfe0a9bd SHA512 ea20958c74ec34d4f8e2f165cda9d0c3e27d94fe7eef374548d74275d35dc7fc7c89395e36b0a00dfc7d2a83b198f179fd44e16f7dc51419f9af1e907616382c +AUX denyhosts.logrotate-r2 272 BLAKE2B 9dd9bad7fd6d1b3fac06a331d2b2246697b70ebf7bef84fda0917d3cf925b3b7f6a30a66c67a7ef52c466096a2860ee8f177097ab44c3000169d879306668ae2 SHA512 43d379b5909937913ca78a11581f577a5d9fe52bb16627441311cdac7281f59a1f05fdb308f722f9c376d2e446111021d225b2033c5fe5f3399ab88771be2569 +AUX denyhosts.service 265 BLAKE2B 4ecccdf6f605936ffb7339c2ec2510f14b0817cf3ed3cf51b540456216b3877e561044973f1eda4a743f717bc4e0f36e9f8492b3fd2b365a243f5f7449ea575c SHA512 601b10e999dd2e16cec57035d025a883df77df272c6a72b4d39f2c118d983f308984aa9edd296f334e0e5062e8ca5ea21ba25ef58b606c9c7e4c09ed7b3ad4be +DIST denyhosts-2.9.tar.gz 49472 BLAKE2B 94f18da3db9dd7e0d979d4fb536160114fe1dc95ac43ad1f7bf3f235702698210e62b3872bf7f3360945228b187d97a274797d535a9b12b552bddf649b5d1fdf SHA512 f41e2985e84f0eeaa493def6b8609de934889d02b124962b0bfd02ebe5e41d0670822124eb50ed84eb1c3b8a2a96775fbe09386cef48a3c3e04949fd6b1452c1 +DIST denyhosts-3.0.tar.gz 56283 BLAKE2B 1ecb8a13ec9511cb4ac65579aa8f88117264f231b586c30a61ad9c78abd17aeebc5642e70f162fa7e73fe81a99821d494efca213b1bf864fd0e2043fa4374e6a SHA512 8a1c796c259049ffab2c88cef780b175ec75c94216841421f831dfbf45f4ba0cdbcfbb0e3dab7200aa79eeb2416db5234ad5016d5770d8ab2f28ef4c9754e70d +EBUILD denyhosts-2.9.ebuild 1860 BLAKE2B d1a3b4b0414fce7fd1eabf226e5fc46abfeae98cf313b2c32bc36a6447625bc3f31f0d0300c5d7b17a328a22aef934f914adf9265ffb15bdcec88fe87fefaf78 SHA512 170d31711fc00f51e6b177cfebcdbeff660a9d2b6cc3eb953d4082e7d3d265cf371da59890ee92b29fea8a2aa740cb25373c0ad6585e9e31db515fd87f512ff4 +EBUILD denyhosts-3.0-r1.ebuild 1780 BLAKE2B 6d4f599a686bc016f48f00aa7c8a666ab849b14043ee2a930e3ae9075bcba4feea50fc26edd1791d0a8f1ce5eb4ddeb069258c70886cd111998a07cb0f5938e8 SHA512 3c49e6abd5722035baa8d5545014f9d954749a6d75e7a7ad54299ad6df06cf294e405cc473d317e370d7215a6ae867ec1de79db7b2d6c1a3d58c326af7842661 +EBUILD denyhosts-3.0.ebuild 1672 BLAKE2B ffce8305ca9db71a456c8163a7bb1fdfcf7187b4433988c93e01f94407dcc0edf577b8d187ad017ff4e357e56d907aa4d34cd4f4d8b292365d46ea2a079be6aa SHA512 660bca4d0ca9fd4eea074cdfde7629d06cb4c6c48f3b0cf9674d6ad62ac931cf51624b67e52862b6b284157643f634495bbce7c6b927bc1b80274ed497a9aad0 +MISC metadata.xml 402 BLAKE2B df1bce989ad8c249f83b5ef00681d455ca645b9160456b615c5a18c1d564d3dff8f6021ed95b9c7ff0d5e6939fe2a99735b4ed16ea8360f021000377f981503b SHA512 0a232a4ee999ce021244cc19ad62e68c962fcfb1cbfda1aef306e6b3376e3944f233cff133c746aedc3f68c60a61511b0a749b434515b705f63d68a034951ed7 diff --git a/app-admin/denyhosts/denyhosts-2.9.ebuild b/app-admin/denyhosts/denyhosts-2.9.ebuild new file mode 100644 index 000000000000..f9a579759fe2 --- /dev/null +++ b/app-admin/denyhosts/denyhosts-2.9.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 eutils readme.gentoo systemd + +DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers" +HOMEPAGE="http://denyhost.sourceforge.net/" +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" + +src_prepare() { + #systemd needs HOSTNAME + epatch "${FILESDIR}"/${PN}-2.6-hostname.patch + + 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.txt PKG-INFO + 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 +} + +pkg_postinst() { + [[ -f "${EROOT}etc/hosts.deny" ]] || touch "${EROOT}etc/hosts.deny" + + readme.gentoo_print_elog +} diff --git a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild new file mode 100644 index 000000000000..87800807c36d --- /dev/null +++ b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 python3_{4,5,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.ebuild b/app-admin/denyhosts/denyhosts-3.0.ebuild new file mode 100644 index 000000000000..cd2c9fdeea38 --- /dev/null +++ b/app-admin/denyhosts/denyhosts-3.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 eutils readme.gentoo 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" + +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-2.6-hostname.patch b/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch new file mode 100644 index 000000000000..56d881319c5f --- /dev/null +++ b/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch @@ -0,0 +1,21 @@ +diff -up ./denyhosts.py.orig ./denyhosts.py +--- ./denyhosts.py.orig 2012-01-30 13:14:41.146715839 -0600 ++++ ./denyhosts.py 2012-01-30 14:45:14.372539341 -0600 +@@ -1,5 +1,6 @@ + #!/usr/bin/env python + import os ++import platform + import sys + + import DenyHosts.python_version +@@ -107,6 +108,10 @@ if __name__ == '__main__': + print "DenyHosts version:", VERSION + sys.exit(0) + ++ # This is generally expected to be in the environment, but there's no ++ # non-hackish way to get systemd to set it, so just hack it in here. ++ os.environ['HOSTNAME'] = platform.node() ++ + prefs = Prefs(config_file) + + first_time = 0 diff --git a/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch b/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch new file mode 100644 index 000000000000..4b727c7067d9 --- /dev/null +++ b/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch @@ -0,0 +1,51 @@ +From b5611dfa0510ec8fbaa2db4b6834d0bd7ecf0909 Mon Sep 17 00:00:00 2001 +From: Jesse +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 new file mode 100644 index 000000000000..9b2f24cbf21e --- /dev/null +++ b/app-admin/denyhosts/files/denyhosts.init-r2 @@ -0,0 +1,27 @@ +#!/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 new file mode 100644 index 000000000000..582e72f7a365 --- /dev/null +++ b/app-admin/denyhosts/files/denyhosts.logrotate-r2 @@ -0,0 +1,10 @@ +/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 new file mode 100644 index 000000000000..05a59dd27bfc --- /dev/null +++ b/app-admin/denyhosts/files/denyhosts.service @@ -0,0 +1,12 @@ +[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 new file mode 100644 index 000000000000..c193ef3b8e0a --- /dev/null +++ b/app-admin/denyhosts/metadata.xml @@ -0,0 +1,12 @@ + + + + + junghans@gentoo.org + Christoph Junghans + + + denyhosts/denyhosts + denyhost + + -- cgit v1.2.3