[gentoo-commits] repo/gentoo:master commit in: app-admin/sshguard/, app-admin/sshguard/files/
commit: 307c5ced37bbe80673d57212b5f8820c9b9173df
Author: Yixun Lan gentoo org>
AuthorDate: Wed Feb 17 11:07:46 2021 +
Commit: Yixun Lan gentoo org>
CommitDate: Wed Feb 17 11:08:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=307c5ced
app-admin/sshguard: drop old
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Yixun Lan gentoo.org>
app-admin/sshguard/files/sshguard-2.1.0-conf.patch | 11 --
app-admin/sshguard/sshguard-2.4.1.ebuild | 40 --
2 files changed, 51 deletions(-)
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 8874cc48904..000
--- 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/sshguard-2.4.1.ebuild
b/app-admin/sshguard/sshguard-2.4.1.ebuild
deleted file mode 100644
index 59ef3538acc..000
--- a/app-admin/sshguard/sshguard-2.4.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 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 ~arm64 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
-}
[gentoo-commits] repo/gentoo:master commit in: app-admin/sshguard/, app-admin/sshguard/files/
commit: dc154eaae27ee058f7c6153df327bd46a540ce50
Author: Jeroen Roovers gentoo org>
AuthorDate: Thu Aug 8 07:10:59 2019 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Thu Aug 8 07:14:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc154eaa
app-admin/sshguard: Fix init.d script
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Fixes: https://bugs.gentoo.org/688820
Signed-off-by: Jeroen Roovers gentoo.org>
app-admin/sshguard/files/{sshguard.initd-r1 => sshguard.initd-r2} | 5 ++---
app-admin/sshguard/sshguard-2.4.0.ebuild | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/app-admin/sshguard/files/sshguard.initd-r1
b/app-admin/sshguard/files/sshguard.initd-r2
similarity index 65%
rename from app-admin/sshguard/files/sshguard.initd-r1
rename to app-admin/sshguard/files/sshguard.initd-r2
index e7b5ca7428b..4404566eb11 100644
--- a/app-admin/sshguard/files/sshguard.initd-r1
+++ b/app-admin/sshguard/files/sshguard.initd-r2
@@ -1,12 +1,11 @@
#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
command="/usr/sbin/sshguard"
pidfile="${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}"
command_args="-i \"${pidfile}\" ${SSHGUARD_OPTS}"
-command_background=1
-start_stop_daemon_args="--wait ${SSHGUARD_WAIT:-999} --interpreted --quiet"
+start_stop_daemon_args="--background --wait ${SSHGUARD_WAIT:-999}
--interpreted --quiet"
depend() {
after iptables
diff --git a/app-admin/sshguard/sshguard-2.4.0.ebuild
b/app-admin/sshguard/sshguard-2.4.0.ebuild
index 2d18f329df5..8926537ef84 100644
--- a/app-admin/sshguard/sshguard-2.4.0.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.0.ebuild
@@ -32,7 +32,7 @@ PATCHES=(
src_install() {
default
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
insinto /etc
[gentoo-commits] repo/gentoo:master commit in: app-admin/sshguard/, app-admin/sshguard/files/
commit: 8fb481d8212bf775242329c6a6bc04b517bcd23d
Author: Patrick McLean gentoo org>
AuthorDate: Thu Apr 12 18:08:56 2018 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Apr 12 18:10:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb481d8
app-admin/sshguard: Revision bump to 2.1.0-r2, rework init script
The old init script did not pass --interpreted to start-stop-daemon
which caused sshguard to always show up as "crashed" in openrc. This
fixes that and reworks the init script to be the more modern
"declarative" format.
Package-Manager: Portage-2.3.28, Repoman-2.3.9
app-admin/sshguard/files/sshguard.initd-r1 | 14 ++
app-admin/sshguard/sshguard-2.1.0-r2.ebuild | 40 +
2 files changed, 54 insertions(+)
diff --git a/app-admin/sshguard/files/sshguard.initd-r1
b/app-admin/sshguard/files/sshguard.initd-r1
new file mode 100644
index 000..e7b5ca7428b
--- /dev/null
+++ b/app-admin/sshguard/files/sshguard.initd-r1
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/sshguard"
+pidfile="${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}"
+command_args="-i \"${pidfile}\" ${SSHGUARD_OPTS}"
+command_background=1
+start_stop_daemon_args="--wait ${SSHGUARD_WAIT:-999} --interpreted --quiet"
+
+depend() {
+ after iptables
+ use logger
+}
diff --git a/app-admin/sshguard/sshguard-2.1.0-r2.ebuild
b/app-admin/sshguard/sshguard-2.1.0-r2.ebuild
new file mode 100644
index 000..7faed8b68c9
--- /dev/null
+++ b/app-admin/sshguard/sshguard-2.1.0-r2.ebuild
@@ -0,0 +1,40 @@
+# 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-r1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+ insinto /etc
+ newins examples/sshguard.conf.sample sshguard.conf
+}
[gentoo-commits] repo/gentoo:master commit in: app-admin/sshguard/, app-admin/sshguard/files/
commit: 45e5275c2de38f27454c5e43e13bc6802b75d81a
Author: Jeroen Roovers gentoo org>
AuthorDate: Thu Nov 9 11:09:11 2017 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Thu Nov 9 11:09:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45e5275c
app-admin/sshguard: Set proper libexec directory in configuration file.
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-admin/sshguard/files/sshguard-2.1.0-conf.patch| 11 +++
.../{sshguard-2.1.0.ebuild => sshguard-2.1.0-r1.ebuild} | 3 +++
2 files changed, 14 insertions(+)
diff --git a/app-admin/sshguard/files/sshguard-2.1.0-conf.patch
b/app-admin/sshguard/files/sshguard-2.1.0-conf.patch
new file mode 100644
index 000..8874cc48904
--- /dev/null
+++ b/app-admin/sshguard/files/sshguard-2.1.0-conf.patch
@@ -0,0 +1,11 @@
+--- 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/sshguard-2.1.0.ebuild
b/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
similarity index 93%
rename from app-admin/sshguard/sshguard-2.1.0.ebuild
rename to app-admin/sshguard/sshguard-2.1.0-r1.ebuild
index 1e45c36ba08..e4aaf2332fd 100644
--- a/app-admin/sshguard/sshguard-2.1.0.ebuild
+++ b/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
@@ -25,6 +25,9 @@ DOCS=(
examples/sshguard.service
examples/whitelistfile.example
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.0-conf.patch
+)
src_install() {
default
[gentoo-commits] repo/gentoo:master commit in: app-admin/sshguard/, app-admin/sshguard/files/
commit: e92a08bc8829ab7ccf0127e5a653b3cea45b7582
Author: Jeroen Roovers gentoo org>
AuthorDate: Wed Dec 16 08:13:50 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Wed Dec 16 08:13:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92a08bc
app-admin/sshguard: Version bump (bug #567642 by Noramo).
Package-Manager: portage-2.2.26
app-admin/sshguard/Manifest | 1 +
app-admin/sshguard/files/sshguard.initd | 2 +-
app-admin/sshguard/sshguard-1.6.1.ebuild | 62
3 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 4b35a74..47cfb52 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1 +1,2 @@
DIST sshguard-1.5.tar.bz2 303767 SHA256
b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19 SHA512
6d17abccd94af9e7fb04a54477ff5686caa64dc36e2f2cbc4a8cd7bc293923daf2fee87fa7f2e247eba1b310abe68549e652ab3224c2d19822d2e8a0306e49e6
WHIRLPOOL
7d579f5c9a03d79f7cc7b51b537b91b053faa56653ba7c5182550ddab41c0fbcd12a6cd7a6dfb2d1e2323905ef3e35aaef9ca8175d97e26cb953d57403f46562
+DIST sshguard-1.6.1.tar.xz 416088 SHA256
f431899c20fa2f41fa293605af96ff97d44823b84db41c914ee60da44f1ff6c8 SHA512
a21c28e2efcadeff514c8a5b1ed938ba466f9116b40ee4283ad411fe6248bfa7186d9add9a136399f659a74fb2b517c6033027ec546dae9bec5b47edf32db3ed
WHIRLPOOL
22a0ace695e9ab6e173bc0bf2d23d584113be0298253d5a13df3749071c68edcd581f3118c326dc42c8b643420b62d1389534b91a2fc537bb9abca49fb84ffbc
diff --git a/app-admin/sshguard/files/sshguard.initd
b/app-admin/sshguard/files/sshguard.initd
index 03b6a09..659c3f7 100644
--- a/app-admin/sshguard/files/sshguard.initd
+++ b/app-admin/sshguard/files/sshguard.initd
@@ -12,7 +12,7 @@ SSHGUARD_PIDFILE=${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}
start() {
ebegin "Starting sshguard"
- [[ -z ${SSHGUARD_WAIT} ]] && SSHGUARD_WAIT=999
+ [ -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 $?
diff --git a/app-admin/sshguard/sshguard-1.6.1.ebuild
b/app-admin/sshguard/sshguard-1.6.1.ebuild
new file mode 100644
index 000..7e740f3
--- /dev/null
+++ b/app-admin/sshguard/sshguard-1.6.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="http://sshguard.sourceforge.net/";
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="ipfilter kernel_FreeBSD kernel_linux"
+
+CDEPEND="
+ kernel_linux? ( net-firewall/iptables )
+ kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )
+"
+DEPEND="
+ ${CDEPEND}
+ sys-devel/flex
+"
+RDEPEND="
+ ${CDEPEND}
+ sys-apps/openrc
+ virtual/logger
+"
+
+DOCS=( ChangeLog README.rst scripts/sshguard_backendgen.sh )
+
+src_prepare() {
+ sed -i -e '/OPTIMIZER_CFLAGS=/d' configure || die
+}
+
+src_configure() {
+ # Needed for usleep(3), see "nasty" in src/sshguard_logsuck.c
+ append-cppflags -D_BSD_SOURCE
+
+ local myconf
+ if use kernel_linux; then
+ myconf="--with-firewall=iptables"
+ elif use kernel_FreeBSD; then
+ if use ipfilter; then
+ myconf="--with-firewall=ipfw"
+ else
+ myconf="--with-firewall=pf"
+ fi
+ fi
+
+ econf ${myconf}
+}
+
+src_install() {
+ default
+
+ dodoc -r examples/
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
