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

[Sergej Pupykin]

    Date: Friday, March 10, 2017 @ 10:33:31
  Author: spupykin
Revision: 215574

upgpkg: sshguard 2.0.0-3

upd

Modified:
  sshguard/trunk/PKGBUILD
Deleted:
  sshguard/trunk/sshguard-journalctl
  sshguard/trunk/sshguard.service

---------------------+
 PKGBUILD            |   22 +++++++++++-----------
 sshguard-journalctl |    2 --
 sshguard.service    |    9 ---------
 3 files changed, 11 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-10 10:09:52 UTC (rev 215573)
+++ PKGBUILD	2017-03-10 10:33:31 UTC (rev 215574)
@@ -4,7 +4,7 @@
 
 pkgname=sshguard
 pkgver=2.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables"
 arch=('i686' 'x86_64')
 url="http://www.sshguard.net/"
@@ -12,16 +12,11 @@
 depends=('iptables')
 backup=('etc/sshguard.conf')
 install=sshguard.install
-source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.gz"
-	"sshguard.service"
-	"sshguard-journalctl")
-sha256sums=('e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06'
-            '299b41c68e3c97535c1eb0f579903303383084a788edc46e6f447c13eacc8352'
-            '58afcafe81d7e6af0ccd37471c6317bb76933bf618202ab76eed45eb931a14b7')
+source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.gz")
+sha256sums=('e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-  echo 'BACKEND="/usr/lib/sshguard/sshg-fw-iptables"' >>examples/sshguard.conf.sample
 }
 
 build() {
@@ -38,7 +33,12 @@
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-  install -Dm0644 "$srcdir/sshguard.service" "$pkgdir/usr/lib/systemd/system/sshguard.service"
-  install -Dm0755 "$srcdir/sshguard-journalctl" "$pkgdir/usr/lib/systemd/scripts/sshguard-journalctl"
-  install -Dm0644 "examples/sshguard.conf.sample" "$pkgdir/etc/sshguard.conf"
+  install -Dm0644 "examples/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"
+BLACKLIST_FILE=120:/var/db/sshguard/blacklist.db
+BACKEND="/usr/lib/sshguard/sshg-fw-iptables"
+EOF
+  cp -a examples "$pkgdir/usr/share/doc/sshguard"
 }

Deleted: sshguard-journalctl
===================================================================
--- sshguard-journalctl	2017-03-10 10:09:52 UTC (rev 215573)
+++ sshguard-journalctl	2017-03-10 10:33:31 UTC (rev 215574)
@@ -1,2 +0,0 @@
-#!/bin/sh
-LANG=C /usr/bin/journalctl -afb -p info -n1 -o cat "$@" | /usr/bin/sshguard

Deleted: sshguard.service
===================================================================
--- sshguard.service	2017-03-10 10:09:52 UTC (rev 215573)
+++ sshguard.service	2017-03-10 10:33:31 UTC (rev 215574)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Block hacking attempts
-After=iptables.service ip6tables.service ufw.service shorewall.service shorewall6.service network.target
-
-[Service]
-ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl SYSLOG_FACILITY=4 SYSLOG_FACILITY=10
-
-[Install]
-WantedBy=multi-user.target