[arch-commits] Commit in sshguard/trunk (4 files)
Date: Monday, December 31, 2018 @ 16:42:54
Author: mtorromeo
Revision: 420039
Ordered service after nftables and remove install file
Added:
sshguard/trunk/sshguard.service
sshguard/trunk/tmpfile.conf
Modified:
sshguard/trunk/PKGBUILD
Deleted:
sshguard/trunk/sshguard.install
--+
PKGBUILD | 14 +-
sshguard.install |4
sshguard.service | 16
tmpfile.conf |1 +
4 files changed, 26 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-12-31 16:29:49 UTC (rev 420038)
+++ PKGBUILD2018-12-31 16:42:54 UTC (rev 420039)
@@ -3,7 +3,7 @@
pkgname=sshguard
pkgver=2.3.0
-pkgrel=1
+pkgrel=2
pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip
with iptables"
arch=('x86_64')
url="http://www.sshguard.net/;
@@ -10,9 +10,12 @@
license=('GPL')
depends=('iptables')
backup=('etc/sshguard.conf')
-install=sshguard.install
-source=("https://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.gz;)
-sha256sums=('d4b53f87a3c26652e5a2899b16506b815fa56a36aaf5bde9c2704bfb1a0ca068')
+source=("https://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.gz;
+"tmpfile.conf"
+"sshguard.service")
+sha256sums=('d4b53f87a3c26652e5a2899b16506b815fa56a36aaf5bde9c2704bfb1a0ca068'
+'cd2ba683f25a650a29dd465ec7eb507826af46822d1a1ea6116a052c77c4148f'
+'ba5b8774be772cdd66508d9b421f102f60243d759d24ad58dffcf9eaab10')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
@@ -33,7 +36,8 @@
package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
- install -Dm0644 "examples/sshguard.service"
"$pkgdir/usr/lib/systemd/system/sshguard.service"
+ install -Dm0644 "$srcdir/tmpfile.conf"
"$pkgdir/usr/lib/tmpfiles.d/sshguard.conf"
+ install -Dm0644 "$srcdir/sshguard.service"
"$pkgdir/usr/lib/systemd/system/sshguard.service"
install -dm0755 "$pkgdir/usr/share/doc/" "$pkgdir/etc"
cat <"$pkgdir"/etc/sshguard.conf
LOGREADER="LANG=C /usr/bin/journalctl -afb -p info -n1 -t sshd -o cat"
Deleted: sshguard.install
===
--- sshguard.install2018-12-31 16:29:49 UTC (rev 420038)
+++ sshguard.install2018-12-31 16:42:54 UTC (rev 420039)
@@ -1,4 +0,0 @@
-post_install() {
- mkdir -p var/db/sshguard
- echo "-- For more information, see
https://wiki.archlinux.org/index.php/Sshguard;
-}
Added: sshguard.service
===
--- sshguard.service(rev 0)
+++ sshguard.service2018-12-31 16:42:54 UTC (rev 420039)
@@ -0,0 +1,16 @@
+[Unit]
+Description=SSHGuard - blocks brute-force login attempts
+After=syslog.target
+After=iptables.service
+After=ip6tables.service
+After=libvirtd.service
+After=firewalld.service
+After=nftables.service
+
+[Service]
+ExecStartPre=-/usr/sbin/iptables -N sshguard
+ExecStart=/usr/sbin/sshguard
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
Added: tmpfile.conf
===
--- tmpfile.conf(rev 0)
+++ tmpfile.conf2018-12-31 16:42:54 UTC (rev 420039)
@@ -0,0 +1 @@
+d /var/db/sshguard 0755 - - -
[arch-commits] Commit in sshguard/trunk (4 files)
Date: Friday, March 10, 2017 @ 09:28:49
Author: spupykin
Revision: 215565
upgpkg: sshguard 2.0.0-2
upd
Modified:
sshguard/trunk/PKGBUILD
sshguard/trunk/sshguard-journalctl
sshguard/trunk/sshguard.install
sshguard/trunk/sshguard.service
-+
PKGBUILD|4 ++--
sshguard-journalctl |4 +---
sshguard.install| 10 --
sshguard.service|2 +-
4 files changed, 4 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-10 09:23:38 UTC (rev 215564)
+++ PKGBUILD2017-03-10 09:28:49 UTC (rev 215565)
@@ -16,8 +16,8 @@
"sshguard.service"
"sshguard-journalctl")
sha256sums=('e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06'
-'77b5cb4d00a34f1a0f03272464bac66793389ba05e89be6b7bfb78bdff0b0e92'
-'ce7c3f56edb1b43e0a1629ed646d667d7196808ba82edf7c9e1c3c9c03fca2ba')
+'299b41c68e3c97535c1eb0f579903303383084a788edc46e6f447c13eacc8352'
+'58afcafe81d7e6af0ccd37471c6317bb76933bf618202ab76eed45eb931a14b7')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
Modified: sshguard-journalctl
===
--- sshguard-journalctl 2017-03-10 09:23:38 UTC (rev 215564)
+++ sshguard-journalctl 2017-03-10 09:28:49 UTC (rev 215565)
@@ -1,4 +1,2 @@
#!/bin/sh
-SSHGUARD_OPTS=$1
-shift
-LANG=C /usr/bin/journalctl -afb -p info -n1 -o cat "$@" | /usr/bin/sshguard
$SSHGUARD_OPTS
+LANG=C /usr/bin/journalctl -afb -p info -n1 -o cat "$@" | /usr/bin/sshguard
Modified: sshguard.install
===
--- sshguard.install2017-03-10 09:23:38 UTC (rev 215564)
+++ sshguard.install2017-03-10 09:28:49 UTC (rev 215565)
@@ -1,14 +1,4 @@
post_install() {
mkdir -p var/db/sshguard
- echo "-- You should add chains to your firewall:"
- echo "-- iptables -N sshguard"
- echo "-- iptables -A INPUT -p tcp --dport 22 -j sshguard"
- echo "-- ip6tables -N sshguard"
- echo "-- ip6tables -A INPUT -p tcp --dport 22 -j sshguard"
- echo "-- touch /etc/iptables/ip6tables.rules if you don't use IPv6"
echo "-- For more information, see
https://wiki.archlinux.org/index.php/Sshguard;
}
-
-post_upgrade() {
- echo "-- touch /etc/iptables/ip6tables.rules if you don't use IPv6"
-}
Modified: sshguard.service
===
--- sshguard.service2017-03-10 09:23:38 UTC (rev 215564)
+++ sshguard.service2017-03-10 09:28:49 UTC (rev 215565)
@@ -3,7 +3,7 @@
After=iptables.service ip6tables.service ufw.service shorewall.service
shorewall6.service network.target
[Service]
-ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl "-b
120:/var/db/sshguard/blacklist.db" SYSLOG_FACILITY=4 SYSLOG_FACILITY=10
+ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl SYSLOG_FACILITY=4
SYSLOG_FACILITY=10
[Install]
WantedBy=multi-user.target
[arch-commits] Commit in sshguard/trunk (4 files)
Date: Monday, May 13, 2013 @ 14:21:03
Author: mtorromeo
Revision: 90627
upgpkg: sshguard 1.5-12
Removed rc.d scripts and moved /usr/sbin to /usr/bin
Modified:
sshguard/trunk/PKGBUILD
sshguard/trunk/sshguard-journalctl
Deleted:
sshguard/trunk/sshguard.conf.d
sshguard/trunk/sshguard.rc
-+
PKGBUILD| 16 +---
sshguard-journalctl |2 +-
sshguard.conf.d |4
sshguard.rc | 27 ---
4 files changed, 6 insertions(+), 43 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-13 12:08:25 UTC (rev 90626)
+++ PKGBUILD2013-05-13 12:21:03 UTC (rev 90627)
@@ -4,7 +4,7 @@
pkgname=sshguard
pkgver=1.5
-pkgrel=11
+pkgrel=12
pkgdesc=Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip
with iptables
arch=('i686' 'x86_64')
#url=http://sourceforge.net/projects/sshguard/;
@@ -14,20 +14,16 @@
options=(zipman)
install=sshguard.install
source=(http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.bz2;
- sshguard.rc
- sshguard.conf.d
sshguard.service
sshguard-journalctl)
sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19'
-'a810da878e40be8616a93c9984e7dbd3700367d665b78b8aa2498228bb33cb6e'
-'66f28e2cc81e5686f8fd5c0d5a5015d7feecbe018a259f4032cfbacf6fe8d1c3'
-'2b2a3c1140349296c3629e77f74c3b29f4ef2ce5f77cb3a811cbed5b46d23028'
-'9491c4cd23d789dd04af551e16dc123f1517ca02ad3539f25715bbeec70ee21e')
+'e9713a067b33b8ea91d203853a033c0b9f6d40ebebd77f2e72903ed4fd355ebd'
+'7423224107b28cabb69489056968581f1c9e94f3edc6a1d189e56a9df0bab4f7')
build() {
cd $srcdir/$pkgname-$pkgver
sed -i 's|^DAYNO.*|DAYNO [0-9]?[1-9]|' src/parser/attack_scanner.l
- ./configure --prefix=/usr --with-firewall=iptables
+ ./configure --prefix=/usr --sbindir=/usr/bin --with-firewall=iptables
make
}
@@ -38,9 +34,7 @@
package() {
cd $srcdir/$pkgname-$pkgver
- make prefix=$pkgdir/usr install
+ make DESTDIR=$pkgdir install
install -Dm0644 $srcdir/sshguard.service
$pkgdir/usr/lib/systemd/system/sshguard.service
- install -Dm0755 $srcdir/sshguard.rc $pkgdir/etc/rc.d/sshguard
- install -Dm0644 $srcdir/sshguard.conf.d $pkgdir/etc/conf.d/sshguard
install -Dm0755 $srcdir/sshguard-journalctl
$pkgdir/usr/lib/systemd/scripts/sshguard-journalctl
}
Modified: sshguard-journalctl
===
--- sshguard-journalctl 2013-05-13 12:08:25 UTC (rev 90626)
+++ sshguard-journalctl 2013-05-13 12:21:03 UTC (rev 90627)
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/bin/journalctl -afbp info -n1 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 |
/usr/sbin/sshguard -l- $@
+/usr/bin/journalctl -afbp info -n1 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 |
/usr/bin/sshguard -l- $@
Deleted: sshguard.conf.d
===
--- sshguard.conf.d 2013-05-13 12:08:25 UTC (rev 90626)
+++ sshguard.conf.d 2013-05-13 12:21:03 UTC (rev 90627)
@@ -1,4 +0,0 @@
-#
-# Arguments to be passed to sshguard
-#
-SSHGUARD_ARGS=
Deleted: sshguard.rc
===
--- sshguard.rc 2013-05-13 12:08:25 UTC (rev 90626)
+++ sshguard.rc 2013-05-13 12:21:03 UTC (rev 90627)
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/sshguard ] . /etc/conf.d/sshguard
-
-case $1 in
- start)
-stat_busy Starting SSHGuard
-/usr/sbin/sshguard -l /var/log/auth.log -b /var/db/sshguard/blacklist.db
${SSHGUARD_ARGS} /dev/null
-add_daemon sshguard
-stat_done
-;;
- stop)
-stat_busy Stopping SSHGuard
-kill `pidof sshguard` /dev/null
-rm_daemon sshguard
-stat_done
-;;
- restart)
- $0 stop
- $0 start
- ;;
-*)
-echo usage: $0 {start|stop|restart}
-esac
-exit 0
