[arch-commits] Commit in darkstat/repos (18 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Mon May 13 10:19:20 EDT 2013


    Date: Monday, May 13, 2013 @ 16:19:19
  Author: spupykin
Revision: 90651

archrelease: copy trunk to community-i686, community-x86_64

Added:
  darkstat/repos/community-i686/PKGBUILD
    (from rev 90650, darkstat/trunk/PKGBUILD)
  darkstat/repos/community-i686/darkstat.conf
    (from rev 90650, darkstat/trunk/darkstat.conf)
  darkstat/repos/community-i686/darkstat.install
    (from rev 90650, darkstat/trunk/darkstat.install)
  darkstat/repos/community-i686/darkstat.service
    (from rev 90650, darkstat/trunk/darkstat.service)
  darkstat/repos/community-x86_64/PKGBUILD
    (from rev 90650, darkstat/trunk/PKGBUILD)
  darkstat/repos/community-x86_64/darkstat.conf
    (from rev 90650, darkstat/trunk/darkstat.conf)
  darkstat/repos/community-x86_64/darkstat.install
    (from rev 90650, darkstat/trunk/darkstat.install)
  darkstat/repos/community-x86_64/darkstat.service
    (from rev 90650, darkstat/trunk/darkstat.service)
Deleted:
  darkstat/repos/community-i686/PKGBUILD
  darkstat/repos/community-i686/darkstat
  darkstat/repos/community-i686/darkstat.conf
  darkstat/repos/community-i686/darkstat.install
  darkstat/repos/community-i686/darkstat.service
  darkstat/repos/community-x86_64/PKGBUILD
  darkstat/repos/community-x86_64/darkstat
  darkstat/repos/community-x86_64/darkstat.conf
  darkstat/repos/community-x86_64/darkstat.install
  darkstat/repos/community-x86_64/darkstat.service

-----------------------------------+
 /PKGBUILD                         |   64 +++++++++++++++++++++++++++
 /darkstat.conf                    |    4 +
 /darkstat.install                 |   40 +++++++++++++++++
 /darkstat.service                 |   34 ++++++++++++++
 community-i686/PKGBUILD           |   37 ----------------
 community-i686/darkstat           |   83 ------------------------------------
 community-i686/darkstat.conf      |    2 
 community-i686/darkstat.install   |   20 --------
 community-i686/darkstat.service   |   17 -------
 community-x86_64/PKGBUILD         |   37 ----------------
 community-x86_64/darkstat         |   83 ------------------------------------
 community-x86_64/darkstat.conf    |    2 
 community-x86_64/darkstat.install |   20 --------
 community-x86_64/darkstat.service |   17 -------
 14 files changed, 142 insertions(+), 318 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-05-13 14:18:54 UTC (rev 90650)
+++ community-i686/PKGBUILD	2013-05-13 14:19:19 UTC (rev 90651)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=darkstat
-pkgver=3.0.715
-pkgrel=8
-pkgdesc="Network statistics gatherer (packet sniffer)"
-url="http://dmr.ath.cx/net/darkstat/"
-license=("GPL")
-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')
-
-build() {
-  cd $srcdir/darkstat-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-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
-}

Copied: darkstat/repos/community-i686/PKGBUILD (from rev 90650, darkstat/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-05-13 14:19:19 UTC (rev 90651)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=darkstat
+pkgver=3.0.715
+pkgrel=9
+pkgdesc="Network statistics gatherer (packet sniffer)"
+url="http://dmr.ath.cx/net/darkstat/"
+license=("GPL")
+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.service
+	darkstat.conf)
+install=darkstat.install
+md5sums=('5b7abc7538dcd8e30667dac150e81d77'
+         '91dd1cf9d01c2b37896f01b4570b5521'
+         'aa9a9effd1e8f08860afcd6439fc94c5')
+
+build() {
+  cd $srcdir/darkstat-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/darkstat-$pkgver
+  make DESTDIR=$pkgdir install
+  install -D -m644 "$srcdir"/darkstat.conf "$pkgdir"/etc/conf.d/darkstat.conf
+  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+}

Deleted: community-i686/darkstat
===================================================================
--- community-i686/darkstat	2013-05-13 14:18:54 UTC (rev 90650)
+++ community-i686/darkstat	2013-05-13 14:19:19 UTC (rev 90651)
@@ -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

Deleted: community-i686/darkstat.conf
===================================================================
--- community-i686/darkstat.conf	2013-05-13 14:18:54 UTC (rev 90650)
+++ community-i686/darkstat.conf	2013-05-13 14:19:19 UTC (rev 90651)
@@ -1,2 +0,0 @@
-DARKSTAT_IFACE="eth0"
-DARKSTAT_ARGS=""

Copied: darkstat/repos/community-i686/darkstat.conf (from rev 90650, darkstat/trunk/darkstat.conf)
===================================================================
--- community-i686/darkstat.conf	                        (rev 0)
+++ community-i686/darkstat.conf	2013-05-13 14:19:19 UTC (rev 90651)
@@ -0,0 +1,2 @@
+DARKSTAT_IFACE="eth0"
+DARKSTAT_ARGS=""

Deleted: community-i686/darkstat.install
===================================================================
--- community-i686/darkstat.install	2013-05-13 14:18:54 UTC (rev 90650)
+++ community-i686/darkstat.install	2013-05-13 14:19:19 UTC (rev 90651)
@@ -1,20 +0,0 @@
-daemon_name=darkstat
-daemon_chroot=var/darkstat
-
-post_install() {
-  if [ ! -d "$daemon_chroot" ]; then
-    install -d "$daemon_chroot"
-    touch "$daemon_chroot/darkstat.dat"
-  fi
-  useradd \
-    --system \
-    --home /"$daemon_chroot" \
-    --shell /bin/false \
-    --no-user-group \
-    --gid nobody "$daemon_name"
-  chown -R "$daemon_name":nobody "/$daemon_chroot"
-}
-
-post_remove() {
-  userdel "$daemon_name"
-}

Copied: darkstat/repos/community-i686/darkstat.install (from rev 90650, darkstat/trunk/darkstat.install)
===================================================================
--- community-i686/darkstat.install	                        (rev 0)
+++ community-i686/darkstat.install	2013-05-13 14:19:19 UTC (rev 90651)
@@ -0,0 +1,20 @@
+daemon_name=darkstat
+daemon_chroot=var/darkstat
+
+post_install() {
+  if [ ! -d "$daemon_chroot" ]; then
+    install -d "$daemon_chroot"
+    touch "$daemon_chroot/darkstat.dat"
+  fi
+  useradd \
+    --system \
+    --home /"$daemon_chroot" \
+    --shell /bin/false \
+    --no-user-group \
+    --gid nobody "$daemon_name"
+  chown -R "$daemon_name":nobody "/$daemon_chroot"
+}
+
+post_remove() {
+  userdel "$daemon_name"
+}

Deleted: community-i686/darkstat.service
===================================================================
--- community-i686/darkstat.service	2013-05-13 14:18:54 UTC (rev 90650)
+++ community-i686/darkstat.service	2013-05-13 14:19:19 UTC (rev 90651)
@@ -1,17 +0,0 @@
-[Unit]
-Description=Network statistics gatherer (packet sniffer)
-After=network.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/conf.d/darkstat.conf
-PIDFile=/var/darkstat/darkstat.pid
-ExecStart=/usr/sbin/darkstat --user "darkstat" --chroot "/var/darkstat" \
-          --import "darkstat.dat" --export "darkstat.dat" \
-          --pidfile /var/darkstat/darkstat.pid \
-          -b 0.0.0.0 \
-          -i "$DARKSTAT_IFACE" $DARKSTAT_ARGS
-ExecStopPost=/bin/rm -f /var/darkstat/darkstat.pid
-
-[Install]
-WantedBy=multi-user.target

Copied: darkstat/repos/community-i686/darkstat.service (from rev 90650, darkstat/trunk/darkstat.service)
===================================================================
--- community-i686/darkstat.service	                        (rev 0)
+++ community-i686/darkstat.service	2013-05-13 14:19:19 UTC (rev 90651)
@@ -0,0 +1,17 @@
+[Unit]
+Description=Network statistics gatherer (packet sniffer)
+After=network.target
+
+[Service]
+Type=simple
+EnvironmentFile=/etc/conf.d/darkstat.conf
+PIDFile=/var/darkstat/darkstat.pid
+ExecStart=/usr/sbin/darkstat --user "darkstat" --chroot "/var/darkstat" \
+          --import "darkstat.dat" --export "darkstat.dat" \
+          --pidfile /var/darkstat/darkstat.pid \
+          -b 0.0.0.0 \
+          -i "$DARKSTAT_IFACE" $DARKSTAT_ARGS
+ExecStopPost=/bin/rm -f /var/darkstat/darkstat.pid
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-05-13 14:18:54 UTC (rev 90650)
+++ community-x86_64/PKGBUILD	2013-05-13 14:19:19 UTC (rev 90651)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=darkstat
-pkgver=3.0.715
-pkgrel=8
-pkgdesc="Network statistics gatherer (packet sniffer)"
-url="http://dmr.ath.cx/net/darkstat/"
-license=("GPL")
-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')
-
-build() {
-  cd $srcdir/darkstat-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-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
-}

Copied: darkstat/repos/community-x86_64/PKGBUILD (from rev 90650, darkstat/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-05-13 14:19:19 UTC (rev 90651)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=darkstat
+pkgver=3.0.715
+pkgrel=9
+pkgdesc="Network statistics gatherer (packet sniffer)"
+url="http://dmr.ath.cx/net/darkstat/"
+license=("GPL")
+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.service
+	darkstat.conf)
+install=darkstat.install
+md5sums=('5b7abc7538dcd8e30667dac150e81d77'
+         '91dd1cf9d01c2b37896f01b4570b5521'
+         'aa9a9effd1e8f08860afcd6439fc94c5')
+
+build() {
+  cd $srcdir/darkstat-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/darkstat-$pkgver
+  make DESTDIR=$pkgdir install
+  install -D -m644 "$srcdir"/darkstat.conf "$pkgdir"/etc/conf.d/darkstat.conf
+  install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
+}

Deleted: community-x86_64/darkstat
===================================================================
--- community-x86_64/darkstat	2013-05-13 14:18:54 UTC (rev 90650)
+++ community-x86_64/darkstat	2013-05-13 14:19:19 UTC (rev 90651)
@@ -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

Deleted: community-x86_64/darkstat.conf
===================================================================
--- community-x86_64/darkstat.conf	2013-05-13 14:18:54 UTC (rev 90650)
+++ community-x86_64/darkstat.conf	2013-05-13 14:19:19 UTC (rev 90651)
@@ -1,2 +0,0 @@
-DARKSTAT_IFACE="eth0"
-DARKSTAT_ARGS=""

Copied: darkstat/repos/community-x86_64/darkstat.conf (from rev 90650, darkstat/trunk/darkstat.conf)
===================================================================
--- community-x86_64/darkstat.conf	                        (rev 0)
+++ community-x86_64/darkstat.conf	2013-05-13 14:19:19 UTC (rev 90651)
@@ -0,0 +1,2 @@
+DARKSTAT_IFACE="eth0"
+DARKSTAT_ARGS=""

Deleted: community-x86_64/darkstat.install
===================================================================
--- community-x86_64/darkstat.install	2013-05-13 14:18:54 UTC (rev 90650)
+++ community-x86_64/darkstat.install	2013-05-13 14:19:19 UTC (rev 90651)
@@ -1,20 +0,0 @@
-daemon_name=darkstat
-daemon_chroot=var/darkstat
-
-post_install() {
-  if [ ! -d "$daemon_chroot" ]; then
-    install -d "$daemon_chroot"
-    touch "$daemon_chroot/darkstat.dat"
-  fi
-  useradd \
-    --system \
-    --home /"$daemon_chroot" \
-    --shell /bin/false \
-    --no-user-group \
-    --gid nobody "$daemon_name"
-  chown -R "$daemon_name":nobody "/$daemon_chroot"
-}
-
-post_remove() {
-  userdel "$daemon_name"
-}

Copied: darkstat/repos/community-x86_64/darkstat.install (from rev 90650, darkstat/trunk/darkstat.install)
===================================================================
--- community-x86_64/darkstat.install	                        (rev 0)
+++ community-x86_64/darkstat.install	2013-05-13 14:19:19 UTC (rev 90651)
@@ -0,0 +1,20 @@
+daemon_name=darkstat
+daemon_chroot=var/darkstat
+
+post_install() {
+  if [ ! -d "$daemon_chroot" ]; then
+    install -d "$daemon_chroot"
+    touch "$daemon_chroot/darkstat.dat"
+  fi
+  useradd \
+    --system \
+    --home /"$daemon_chroot" \
+    --shell /bin/false \
+    --no-user-group \
+    --gid nobody "$daemon_name"
+  chown -R "$daemon_name":nobody "/$daemon_chroot"
+}
+
+post_remove() {
+  userdel "$daemon_name"
+}

Deleted: community-x86_64/darkstat.service
===================================================================
--- community-x86_64/darkstat.service	2013-05-13 14:18:54 UTC (rev 90650)
+++ community-x86_64/darkstat.service	2013-05-13 14:19:19 UTC (rev 90651)
@@ -1,17 +0,0 @@
-[Unit]
-Description=Network statistics gatherer (packet sniffer)
-After=network.target
-
-[Service]
-Type=simple
-EnvironmentFile=/etc/conf.d/darkstat.conf
-PIDFile=/var/darkstat/darkstat.pid
-ExecStart=/usr/sbin/darkstat --user "darkstat" --chroot "/var/darkstat" \
-          --import "darkstat.dat" --export "darkstat.dat" \
-          --pidfile /var/darkstat/darkstat.pid \
-          -b 0.0.0.0 \
-          -i "$DARKSTAT_IFACE" $DARKSTAT_ARGS
-ExecStopPost=/bin/rm -f /var/darkstat/darkstat.pid
-
-[Install]
-WantedBy=multi-user.target

Copied: darkstat/repos/community-x86_64/darkstat.service (from rev 90650, darkstat/trunk/darkstat.service)
===================================================================
--- community-x86_64/darkstat.service	                        (rev 0)
+++ community-x86_64/darkstat.service	2013-05-13 14:19:19 UTC (rev 90651)
@@ -0,0 +1,17 @@
+[Unit]
+Description=Network statistics gatherer (packet sniffer)
+After=network.target
+
+[Service]
+Type=simple
+EnvironmentFile=/etc/conf.d/darkstat.conf
+PIDFile=/var/darkstat/darkstat.pid
+ExecStart=/usr/sbin/darkstat --user "darkstat" --chroot "/var/darkstat" \
+          --import "darkstat.dat" --export "darkstat.dat" \
+          --pidfile /var/darkstat/darkstat.pid \
+          -b 0.0.0.0 \
+          -i "$DARKSTAT_IFACE" $DARKSTAT_ARGS
+ExecStopPost=/bin/rm -f /var/darkstat/darkstat.pid
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list