From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- app-admin/sshguard/Manifest | 8 ++-- app-admin/sshguard/files/sshguard-2.4.1-conf.patch | 25 +++++++++++ app-admin/sshguard/metadata.xml | 18 ++++---- app-admin/sshguard/sshguard-2.4.0.ebuild | 40 ------------------ app-admin/sshguard/sshguard-2.4.1-r1.ebuild | 49 ++++++++++++++++++++++ app-admin/sshguard/sshguard-2.4.1.ebuild | 4 +- 6 files changed, 91 insertions(+), 53 deletions(-) create mode 100644 app-admin/sshguard/files/sshguard-2.4.1-conf.patch delete mode 100644 app-admin/sshguard/sshguard-2.4.0.ebuild create mode 100644 app-admin/sshguard/sshguard-2.4.1-r1.ebuild (limited to 'app-admin/sshguard') diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest index fdf855ff693b..9708d053ebe4 100644 --- a/app-admin/sshguard/Manifest +++ b/app-admin/sshguard/Manifest @@ -1,9 +1,9 @@ AUX sshguard-2.1.0-conf.patch 408 BLAKE2B bec9debaa542d7d2d7f21d5308cda162a75a639a85d712a1adfe253fed735a1b85d83b0b0297db96fada22e61e332f5847b2815280f8ddda105cbe6d9194bf6c SHA512 5edfbf3a6955d86233de10665bea527a2e8ebaaeb505d16073c861fa2883b32d0c655f5d4c99145af63df95612129dcd25ffae3710c8615709768bdcff9ef5bc +AUX sshguard-2.4.1-conf.patch 1203 BLAKE2B db97df31d61de23622faaaffdef23c5f55dac3fbe6947f6ec9b2dd3129cefac047acaf1134fb2259bb1d643f7a4bc61f699bfbd8e7523fa42f0f775b22a8b233 SHA512 54279f52e84ab5d32c4af5d2953ca6927b9c4dee2b4b9dda50c11cbf83f5051cc5c02ee25b8822e3e2b035fb7a0620d17706f84b028cc4f249b2cd733f41272f AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee61ab028f8320c35552b80d5d8222ed35adb13a70cf6096eb5d88749f5b5ff72ca483f27fd1c0de56 SHA512 72b2a9c995bcb604516525f8190eaf35fa57e18274f83a8d00fd5b223b598c0c4ffd8b7ce89b1139c89380e5a7181c8024a6041375c445edb29c8f8b49abee50 AUX sshguard.initd-r2 389 BLAKE2B b4098e0baf82e1c1f1978d6b3916fe9f2e67891d02b7b842492558f9b44c1c0c23204d88c036f49e069c42b0fbbdba31d8292419a2d22e603f29926228a8a223 SHA512 951ea1479836d1b318c35be03c340e5101aa3663bf2581cd0d928de2fea36f0b7906e50d9abf1b6b11fa682427e8d72b45bc95bb8f40a85fb471bfe354108108 -DIST sshguard-2.4.0.tar.gz 771506 BLAKE2B 82e9caf70dc9a1ba9ef6ba1c0916424a74891c84069a4a879c9057f3baea32af68f35d8b31cacdd60d323f5ec7b02a6e12aff1ec72fc0291b74c4882cd441d93 SHA512 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6 DIST sshguard-2.4.1.tar.gz 723940 BLAKE2B 04e72b9959ef3ead418d2a6fe8029b0806a4d91c91f7cd36c236c7203cca1afc67305b21de0b1dee1594b188564f201ff2770d54d4c57c54b4d23db15e0298a0 SHA512 bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8 -EBUILD sshguard-2.4.0.ebuild 746 BLAKE2B 0284fa3b1f9204fbca96a816efbe9c547556fd3b0cc18c5cf8b35d1e90bed01f4e0db7d0cf1705a575486ef11cbfd609deb8b06eb5c3a841415b853e62d96530 SHA512 8e6a32839fee40b4870ddd1b4308b44c8b3d3a0e9136f269bb935178e9f8551b8194a4a8e6f20f778c4a77ec261009928fa7267f357986ca27617d532360fddb -EBUILD sshguard-2.4.1.ebuild 755 BLAKE2B 7604917bd565cf777a017f0385fd72e7cdcc3064b4c35d4884f9a6e3d1579a79fc1a7395a5a303bf6532d5c770ad194420e8b47f28b7af7e5edc3bfe4d6bf176 SHA512 92e4232be6d26e533e26265294cdb3da3b76a78e5d1b0559360a60e0fbff70dea032b9c6474ef65181908eca003132d4e7fef462d1902278408033bd050e6f31 +EBUILD sshguard-2.4.1-r1.ebuild 960 BLAKE2B 43cec652fbde0e0d569661bd52bba0ed35c7c5916b272de160df1abdd439ddd8c6f06c6d7beb7ccea5585241e4c5a2a6c431e953496e9a6366ca561fb1679fac SHA512 e35123be0d62e9d1858430b9ccc4a4457c9c1c31b8ebfcc7f274b11cbd72bdf7a24c4d71f84b056abfc42ed7a0da3cb437baf0d46b67866a0172c16ca5193060 +EBUILD sshguard-2.4.1.ebuild 753 BLAKE2B 71a9c76e2204a0c23a282c434d6514cfa0b828df4a0cf1e304d32835c0de525624258024cb0d81e559bd4f4666632fb01820fc55090a77fe4e487ac5f2a3e122 SHA512 99f02f936b5be1cee0865c613798730202f7464e4e4b437b9f0e962edb1a0b799f8959d578e36c7b38b25eb48f7e0a93048bbc368213a2fba145e40743ae5a3f EBUILD sshguard-99999.ebuild 799 BLAKE2B 38b307936f73e2926466241496fdf59a6cf7def5e60405674a1a07666cdbf0042310977e79078352e623244670e22a8cd41b2ff7969b2ca6577441beca55ca69 SHA512 a33dbdc779c7021aecfa9927eb7e41313ce8b82f3509f1a33e8beacae5597db7e8f5b1a1484edee7e03956fe07d9a39717673985bc8988dba0e20835cd722aea -MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec +MISC metadata.xml 459 BLAKE2B 52a25ead1bb594b1929641a855e1ced3b2e9f8323892ff4f387f3f27cf329bfd6b89fe2ec567b9a4da3daf1792440421c466c95bdc206ac0d6a5e53339454fde SHA512 1389c2bbcfe412dcc96cb62f3e5a61aafa782adbef69e9861a380fc845f3f81d9412c6a1c3e8ac927fefd1e1959e4991dff450e4802cdff2c2924f1e350ae12c diff --git a/app-admin/sshguard/files/sshguard-2.4.1-conf.patch b/app-admin/sshguard/files/sshguard-2.4.1-conf.patch new file mode 100644 index 000000000000..8eb74a84db34 --- /dev/null +++ b/app-admin/sshguard/files/sshguard-2.4.1-conf.patch @@ -0,0 +1,25 @@ +diff --git a/examples/sshguard.conf.sample b/examples/sshguard.conf.sample +index 556f1ec..a483b1e 100644 +--- a/examples/sshguard.conf.sample ++++ b/examples/sshguard.conf.sample +@@ -6,14 +6,18 @@ + + #### REQUIRED CONFIGURATION #### + # Full path to backend executable (required, no default) +-#BACKEND="/usr/local/libexec/sshg-fw-iptables" ++# Example 1: iptables backend ++#BACKEND="/usr/libexec/sshg-fw-iptables" ++# Example 2: firewalld backend; for firewalld configuration instructions see ++# https://www.ctrl.blog/entry/how-to-sshguard-firewalld.html#sshguard-section-firewalld ++#BACKEND="/usr/libexec/sshg-fw-firewalld" + + # Space-separated list of log files to monitor. (optional, no default) + #FILES="/var/log/auth.log /var/log/authlog /var/log/maillog" + + # Shell command that provides logs on standard output. (optional, no default) + # Example 1: ssh and sendmail from systemd journal: +-#LOGREADER="LANG=C /usr/bin/journalctl -afb -p info -n1 -t sshd -t sendmail -o cat" ++#LOGREADER="LANG=C /bin/journalctl -afb -p info -n1 -t sshd -t sendmail -o cat" + # Example 2: ssh from os_log (macOS 10.12+) + #LOGREADER="/usr/bin/log stream --style syslog --predicate '(processImagePath contains \"sshd\")'" + diff --git a/app-admin/sshguard/metadata.xml b/app-admin/sshguard/metadata.xml index 0daba0da53ea..683fe7aa81ea 100644 --- a/app-admin/sshguard/metadata.xml +++ b/app-admin/sshguard/metadata.xml @@ -1,11 +1,15 @@ - -netmon@gentoo.org -Gentoo network monitoring and analysis project - - -sshguard - + + dlan@gentoo.org + Yixun Lan + + + netmon@gentoo.org + Gentoo network monitoring and analysis project + + + sshguard + diff --git a/app-admin/sshguard/sshguard-2.4.0.ebuild b/app-admin/sshguard/sshguard-2.4.0.ebuild deleted file mode 100644 index 56a7c135e833..000000000000 --- a/app-admin/sshguard/sshguard-2.4.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="protects hosts from brute force attacks against ssh" -HOMEPAGE="https://www.sshguard.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm x86" - -DEPEND=" - sys-devel/flex -" -RDEPEND=" - virtual/logger -" -DOCS=( - CHANGELOG.rst - CONTRIBUTING.rst - README.rst - examples/net.sshguard.plist - examples/sshguard.service - examples/whitelistfile.example -) -PATCHES=( - "${FILESDIR}"/${PN}-2.1.0-conf.patch -) - -src_install() { - default - - newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} - - insinto /etc - newins examples/sshguard.conf.sample sshguard.conf -} diff --git a/app-admin/sshguard/sshguard-2.4.1-r1.ebuild b/app-admin/sshguard/sshguard-2.4.1-r1.ebuild new file mode 100644 index 000000000000..7def7a057974 --- /dev/null +++ b/app-admin/sshguard/sshguard-2.4.1-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd +DESCRIPTION="protects hosts from brute force attacks against ssh" +HOMEPAGE="https://www.sshguard.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +DEPEND=" + sys-devel/flex +" +RDEPEND=" + virtual/logger +" +DOCS=( + CHANGELOG.rst + CONTRIBUTING.rst + README.rst + examples/net.sshguard.plist + examples/whitelistfile.example +) +PATCHES=( + "${FILESDIR}"/${PN}-2.4.1-conf.patch +) + +src_prepare() { + default + sed -i -e "/ExecStartPre/s:/usr/sbin:/sbin:g" \ + -e "/ExecStart/s:/usr/local/sbin:/usr/sbin:g" \ + "${S}"/examples/${PN}.service || die +} + +src_install() { + default + + newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + + insinto /etc + newins examples/sshguard.conf.sample sshguard.conf + + systemd_dounit "${S}"/examples/sshguard.service +} diff --git a/app-admin/sshguard/sshguard-2.4.1.ebuild b/app-admin/sshguard/sshguard-2.4.1.ebuild index fc6a2cf36767..59ef3538accd 100644 --- a/app-admin/sshguard/sshguard-2.4.1.ebuild +++ b/app-admin/sshguard/sshguard-2.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" DEPEND=" sys-devel/flex -- cgit v1.2.3