Sat May 26 00:02:35 UTC 2012

3 files changed, 43 insertions, 33 deletions

diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index 0ca10b54b..006e17429 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -1,42 +1,45 @@
-# $Id: PKGBUILD 61627 2012-01-04 23:16:10Z seblu $
-# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# $Id: PKGBUILD 71212 2012-05-25 00:16:39Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Valere Monseur <valere_monseur@hotmail.com>
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=conntrack-tools
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/conntrack-tools'
 license=('GPL2')
 depends=('libnetfilter_conntrack')
 backup=('etc/conntrackd/conntrackd.conf')
-source=("http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.bz2"
+source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
         'conntrackd.rc'
-        'conntrackd.conf')
+        'conntrackd.conf'
+        'conntrackd.service')
 md5sums=('8a60f02a177fc31fe40cc992c4de90e2'
-         '619ab1e15837436b47cbdc739d69ee78'
-         '92a7fc6ab5cba5e48cde4cac0ac403b1')
+         '977dfb8fc58df0c74120c8ac92026a6a'
+         '92a7fc6ab5cba5e48cde4cac0ac403b1'
+         'bd135eaefb47923bb8e8d26f084d3e9d')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  # initscripts scripts
+  # install binaries
+  pushd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  popd
+  # initscripts & systemd
   install -D -m 755 conntrackd.rc "$pkgdir/etc/rc.d/conntrackd"
   install -D -m 644 conntrackd.conf "$pkgdir/etc/conf.d/conntrackd"
-
+  install -D -m 644 conntrackd.service \
+    "$pkgdir/usr/lib/systemd/system/conntrackd.service"
   # install empty configuration files
-  install -D -m 644 /dev/null "${pkgdir}/etc/conntrackd/conntrackd.conf"
-
-  # install binaries
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  install -D -m 644 /dev/null "$pkgdir/etc/conntrackd/conntrackd.conf"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/conntrack-tools/conntrackd.rc b/community/conntrack-tools/conntrackd.rc
index ba1c7ef49..a7040c633 100644
--- a/community/conntrack-tools/conntrackd.rc
+++ b/community/conntrack-tools/conntrackd.rc
@@ -4,31 +4,30 @@
 . /etc/rc.d/functions
 . /etc/conf.d/${0##*/}
 
-NAME=conntrackd
 DAEMON=/usr/sbin/conntrackd
 PID=$(pidof -o %PPID $DAEMON)
 
 case "$1" in
-	start)
-		stat_busy "Starting $NAME daemon"
-		[[ ! $PID ]] && $DAEMON $DAEMON_OPTIONS && add_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
+  start)
+    stat_busy "Starting ${0##*/} daemon"
+    [[ ! $PID ]] && $DAEMON $DAEMON_OPTIONS && add_daemon ${0##*/} && stat_done && exit 0
+    stat_fail
+  ;;
   stop)
-		stat_busy "Stopping $NAME daemon"
-		[[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0
-		stat_fail
-	;;
+    stat_busy "Stopping ${0##*/} daemon"
+    [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
+    stat_fail
+  ;;
   restart)
-		$0 stop
-		$0 start
-		exit 0
-	;;
-  *) 
-		echo "usage: ${0##*/} {start|stop|restart}" >&2
-	;;
+    $0 stop
+    $0 start
+    exit 0
+  ;;
+  *)
+    echo "usage: ${0##*/} {start|stop|restart}" >&2
+  ;;
 esac
 
 exit 1
 
-# vim:set ts=2 sw=2 ft=sh noet:
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/conntrack-tools/conntrackd.service b/community/conntrack-tools/conntrackd.service
new file mode 100644
index 000000000..25a113785
--- /dev/null
+++ b/community/conntrack-tools/conntrackd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Conntrack Daemon
+
+[Service]
+ExecStart=/usr/sbin/conntrackd
+
+[Install]
+WantedBy=multi-user.target