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

[Massimiliano Torromeo]

    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
===================================================================
--- PKGBUILD	2013-05-13 12:08:25 UTC (rev 90626)
+++ PKGBUILD	2013-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