* [gentoo-commits] repo/gentoo:master commit in: app-admin/sshguard/files/, app-admin/sshguard/
@ 2019-08-08 7:14 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2019-08-08 7:14 UTC (permalink / raw
To: gentoo-commits
commit: 243010d354f8a4eb872f43120a0bd28c92c16ce4
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 8 07:12:45 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Aug 8 07:14:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=243010d3
app-admin/sshguard: Old
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
app-admin/sshguard/Manifest | 2 --
app-admin/sshguard/files/sshguard.initd | 24 -----------------
app-admin/sshguard/sshguard-2.1.0-r1.ebuild | 40 -----------------------------
app-admin/sshguard/sshguard-2.3.1.ebuild | 40 -----------------------------
4 files changed, 106 deletions(-)
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 799fe68405e..4ef05135180 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1,3 +1 @@
-DIST sshguard-2.1.0.tar.gz 1117466 BLAKE2B 1a105f346aa9b774fb0314161d779eadaab299d3b74181a449ab86534e11375e4c017c142bc621733593369bcebada9511dd40c64cb4a49cd124eb7537ae0717 SHA512 0a75e9d1a8c9c010c767a49e96e88db4a92aae8d428deebcff1ce8befa36b77cb1937f2fcb2a4e2a3e86d47896a8405265eb30ee7a603fc18a3ee117d646b119
-DIST sshguard-2.3.1.tar.gz 765330 BLAKE2B d86fe596c788209cb35c699601ccb698365e0c6b497ef8184c64d879ebb821a57e5f366c3b518e6f0c6bf65952b2c675f87f029b7b8184466c7f90d6dfebaca3 SHA512 b24f5dba34bed9246665c432b379afa4f1edacb56fd41e0b254a698ded1280c33fd51fb36466ae70d44ef4a31a0a75b59fa4df97d0e8ed8d194bf8046a3ac84d
DIST sshguard-2.4.0.tar.gz 771506 BLAKE2B 82e9caf70dc9a1ba9ef6ba1c0916424a74891c84069a4a879c9057f3baea32af68f35d8b31cacdd60d323f5ec7b02a6e12aff1ec72fc0291b74c4882cd441d93 SHA512 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6
diff --git a/app-admin/sshguard/files/sshguard.initd b/app-admin/sshguard/files/sshguard.initd
deleted file mode 100644
index f1360ce8610..00000000000
--- a/app-admin/sshguard/files/sshguard.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- after iptables
- use logger
-}
-
-SSHGUARD_PIDFILE=${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}
-
-start() {
- ebegin "Starting sshguard"
- [ -z "${SSHGUARD_WAIT}" ] && SSHGUARD_WAIT=999
- start-stop-daemon --start --wait ${SSHGUARD_WAIT} --background --quiet --exec \
- /usr/sbin/sshguard -- -i ${SSHGUARD_PIDFILE} ${SSHGUARD_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping sshguard"
- start-stop-daemon --stop -p ${SSHGUARD_PIDFILE}
- eend $?
-}
diff --git a/app-admin/sshguard/sshguard-2.1.0-r1.ebuild b/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
deleted file mode 100644
index 5fc804a5f54..00000000000
--- a/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="http://sshguard.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x86-fbsd"
-
-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 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
- insinto /etc
- newins examples/sshguard.conf.sample sshguard.conf
-}
diff --git a/app-admin/sshguard/sshguard-2.3.1.ebuild b/app-admin/sshguard/sshguard-2.3.1.ebuild
deleted file mode 100644
index 3fac136a82f..00000000000
--- a/app-admin/sshguard/sshguard-2.3.1.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 ~x86-fbsd"
-
-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-r1 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
- insinto /etc
- newins examples/sshguard.conf.sample sshguard.conf
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/sshguard/files/, app-admin/sshguard/
@ 2021-02-13 16:15 Yixun Lan
0 siblings, 0 replies; 2+ messages in thread
From: Yixun Lan @ 2021-02-13 16:15 UTC (permalink / raw
To: gentoo-commits
commit: e1d4d69e32832607488d8deee82b61e26f061c02
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 15:52:47 2021 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 15:56:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d4d69e
app-admin/sshguard: install systemd unit file
Closes: https://bugs.gentoo.org/588726
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
app-admin/sshguard/files/sshguard-2.4.1-conf.patch | 25 +++++++++++
app-admin/sshguard/sshguard-2.4.1-r1.ebuild | 49 ++++++++++++++++++++++
2 files changed, 74 insertions(+)
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 00000000000..8eb74a84db3
--- /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/sshguard-2.4.1-r1.ebuild b/app-admin/sshguard/sshguard-2.4.1-r1.ebuild
new file mode 100644
index 00000000000..7def7a05797
--- /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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-13 16:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-13 16:15 [gentoo-commits] repo/gentoo:master commit in: app-admin/sshguard/files/, app-admin/sshguard/ Yixun Lan
-- strict thread matches above, loose matches on Subject: below --
2019-08-08 7:14 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox