7 files changed, 77 insertions, 71 deletions
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 629f144fe4bd..c01af9f3c964 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1,2 +1 @@
-DIST sshguard-2.4.0.tar.gz 771506 BLAKE2B 82e9caf70dc9a1ba9ef6ba1c0916424a74891c84069a4a879c9057f3baea32af68f35d8b31cacdd60d323f5ec7b02a6e12aff1ec72fc0291b74c4882cd441d93 SHA512 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6
 DIST sshguard-2.4.1.tar.gz 723940 BLAKE2B 04e72b9959ef3ead418d2a6fe8029b0806a4d91c91f7cd36c236c7203cca1afc67305b21de0b1dee1594b188564f201ff2770d54d4c57c54b4d23db15e0298a0 SHA512 bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8
diff --git a/app-admin/sshguard/files/sshguard-2.1.0-conf.patch b/app-admin/sshguard/files/sshguard-2.1.0-conf.patch
deleted file mode 100644
index 8874cc48904d..000000000000
--- a/app-admin/sshguard/files/sshguard-2.1.0-conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/examples/sshguard.conf.sample
-+++ b/examples/sshguard.conf.sample
-@@ -6,7 +6,7 @@
- 
- #### REQUIRED CONFIGURATION ####
- # Full path to backend executable (required, no default)
--#BACKEND="/usr/local/libexec/sshg-fw-iptables"
-+#BACKEND="/usr/libexec/sshg-fw-iptables"
- 
- # Space-separated list of log files to monitor. (optional, no default)
- #FILES="/var/log/auth.log /var/log/authlog /var/log/maillog"
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..da30c85601e5 100644
--- a/app-admin/sshguard/metadata.xml
+++ b/app-admin/sshguard/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<upstream>
-<remote-id type="sourceforge">sshguard</remote-id>
-</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>dlan@gentoo.org</email>
+  <name>Yixun Lan</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>netmon@gentoo.org</email>
+  <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">sshguard</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
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.ebuild b/app-admin/sshguard/sshguard-2.4.1-r1.ebuild
index 59ef3538accd..dee670ce9642 100644
--- a/app-admin/sshguard/sshguard-2.4.1.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.1-r1.ebuild
@@ -3,13 +3,20 @@
 
 EAPI=7
 
+inherit autotools systemd
 DESCRIPTION="protects hosts from brute force attacks against ssh"
 HOMEPAGE="https://www.sshguard.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+if [[ "${PV}" == 99999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DEPEND="
 	sys-devel/flex
@@ -22,13 +29,21 @@ DOCS=(
 	CONTRIBUTING.rst
 	README.rst
 	examples/net.sshguard.plist
-	examples/sshguard.service
 	examples/whitelistfile.example
 )
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-conf.patch
+	"${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
+	eautoreconf
+}
+
 src_install() {
 	default
 
@@ -37,4 +52,6 @@ src_install() {
 
 	insinto /etc
 	newins examples/sshguard.conf.sample sshguard.conf
+
+	systemd_dounit "${S}"/examples/sshguard.service
 }
diff --git a/app-admin/sshguard/sshguard-99999.ebuild b/app-admin/sshguard/sshguard-99999.ebuild
index 0f9a63205b67..ee4653a215e3 100644
--- a/app-admin/sshguard/sshguard-99999.ebuild
+++ b/app-admin/sshguard/sshguard-99999.ebuild
@@ -1,16 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3
 
+inherit autotools systemd
 DESCRIPTION="protects hosts from brute force attacks against ssh"
 HOMEPAGE="https://www.sshguard.net/"
-EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}"
+
+if [[ "${PV}" == 99999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}"
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
 
 DEPEND="
 	sys-devel/flex
@@ -23,15 +29,18 @@ DOCS=(
 	CONTRIBUTING.rst
 	README.rst
 	examples/net.sshguard.plist
-	examples/sshguard.service
 	examples/whitelistfile.example
 )
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-conf.patch
+	"${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
 	eautoreconf
 }
 
@@ -43,4 +52,6 @@ src_install() {
 
 	insinto /etc
 	newins examples/sshguard.conf.sample sshguard.conf
+
+	systemd_dounit "${S}"/examples/sshguard.service
 }