[arch-commits] Commit in sshguard/trunk (4 files)

[Massimiliano Torromeo]

    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
===================================================================
--- PKGBUILD	2018-12-31 16:29:49 UTC (rev 420038)
+++ PKGBUILD	2018-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'
+            'ba5b8774be772cdd6650eeee8d9b421f102f60243d759d24ad58dffcf9eaab10')
 
 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 <<EOF >"$pkgdir"/etc/sshguard.conf
 LOGREADER="LANG=C /usr/bin/journalctl -afb -p info -n1 -t sshd -o cat"

Deleted: sshguard.install
===================================================================
--- sshguard.install	2018-12-31 16:29:49 UTC (rev 420038)
+++ sshguard.install	2018-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.service	2018-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.conf	2018-12-31 16:42:54 UTC (rev 420039)
@@ -0,0 +1 @@
+d /var/db/sshguard 0755 - - -