Tue May 14 01:18:40 PDT 2013

2 files changed, 2 insertions, 90 deletions

diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD
index 289faa868..4ef26c787 100644
--- a/community/darkstat/PKGBUILD
+++ b/community/darkstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 86508 2013-03-18 12:20:58Z spupykin $
+# $Id: PKGBUILD 90651 2013-05-13 14:19:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=darkstat
 pkgver=3.0.715
-pkgrel=8
+pkgrel=9
 pkgdesc="Network statistics gatherer (packet sniffer)"
 url="http://dmr.ath.cx/net/darkstat/"
 license=("GPL")
@@ -11,12 +11,10 @@ arch=(i686 x86_64)
 depends=('libpcap' 'zlib' 'gcc-libs')
 backup=('etc/conf.d/darkstat.conf')
 source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2
-	darkstat
 	darkstat.service
 	darkstat.conf)
 install=darkstat.install
 md5sums=('5b7abc7538dcd8e30667dac150e81d77'
-         '1021f95fabe16cfab4c95f6264d535e5'
          '91dd1cf9d01c2b37896f01b4570b5521'
          'aa9a9effd1e8f08860afcd6439fc94c5')
 
@@ -29,9 +27,6 @@ build() {
 package() {
   cd $srcdir/darkstat-$pkgver
   make DESTDIR=$pkgdir install
-
-  # darkstat script
-  install -D -m755 "$srcdir"/darkstat "$pkgdir"/etc/rc.d/darkstat
   install -D -m644 "$srcdir"/darkstat.conf "$pkgdir"/etc/conf.d/darkstat.conf
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
 }
diff --git a/community/darkstat/darkstat b/community/darkstat/darkstat
deleted file mode 100755
index 26df1761a..000000000
--- a/community/darkstat/darkstat
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-
-daemon_bin="/usr/sbin/darkstat"
-daemon_name=$(basename $daemon_bin)
-daemon_chroot=/var/$daemon_name
-daemon_database="$daemon_name.dat"
-daemon_output="$daemon_chroot/$daemon_name.out"
-PIDF="$daemon_chroot/$daemon_name.pid"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f $PIDF ] && rm -f $PIDF
-      # RUN
-      $daemon_bin --user "$daemon_name" --chroot "$daemon_chroot" \
-          --import "$daemon_database" \
-          --export "$daemon_database" \
-          --pidfile "$(basename $PIDF)" \
-          -i "$DARKSTAT_IFACE" \
-          $DARKSTAT_ARGS \
-          2>&1 | tee "$daemon_output"
-      ret=$?
-      grep -q error "$daemon_output" 2>/dev/null
-      error_output=$?
-      rm -f "$daemon_output"
-      #
-      if [ $ret -gt 0 -o $error_output -eq 0 ] ; then
-        stat_fail
-        rm -f "$PIDF"
-        exit 1
-      else
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f $PIDF &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0