Fri May 31 06:21:01 PDT 2013

4 files changed, 6 insertions, 58 deletions

diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD
index d16e10cd1..d27feb7d8 100644
--- a/community/tinc/PKGBUILD
+++ b/community/tinc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88838 2013-04-23 16:26:01Z tredaelli $
+# $Id: PKGBUILD 92047 2013-05-31 00:34:01Z seblu $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: helios
 # Contributor: Lothar Gesslein
@@ -6,26 +6,23 @@
 
 pkgname=tinc
 pkgver=1.0.21
-pkgrel=1
+pkgrel=2
 pkgdesc="VPN (Virtual Private Network) daemon"
 arch=('i686' 'x86_64')
 url="http://www.tinc-vpn.org/"
 license=('GPL')
 depends=('lzo2' 'openssl')
-backup=(etc/conf.d/tincd.conf)
 install=tinc.install
 source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
-        tincd.rc tincd.conf tincd@.service)
+        tincd@.service)
 md5sums=('d7bc9ca38672c9da08d74ff2a3e8e36d'
          'SKIP'
-         '64bb53748d9051255f243003f0d511f5'
-         '7c0276d4812cc5d3cc18142562a3aa82'
-         '035b0e549b08da55d19a8df5b8306e4d')
+         '112327da32fdb56ab779fe004712235f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
   make
 }
 
@@ -38,7 +35,5 @@ package() {
   find "$pkgdir"/usr/share/tinc/examples -type f -exec chmod 644 {} +
   find "$pkgdir"/usr/share/tinc/examples -type d -exec chmod 755 {} +
 
-  install -Dm755 "$srcdir/tincd.rc" "$pkgdir/etc/rc.d/tincd"
-  install -Dm644 "$srcdir/tincd.conf" "$pkgdir/etc/conf.d/tincd.conf"
   install -Dm644 "$srcdir/tincd@.service" "$pkgdir/usr/lib/systemd/system/tincd@.service"
 }
diff --git a/community/tinc/tincd.conf b/community/tinc/tincd.conf
deleted file mode 100644
index 6e0902bbb..000000000
--- a/community/tinc/tincd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Extra options to be passed to tincd.
-# TINCD_EXTRAOPTS="-d"
-
-# Arrays containing all names of the networks to be started from rc.d.
-NETNAMES=()
diff --git a/community/tinc/tincd.rc b/community/tinc/tincd.rc
deleted file mode 100644
index 48c132f25..000000000
--- a/community/tinc/tincd.rc
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-daemon_name=tincd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-case "$1" in
-  start)
-    for net in "${NETNAMES[@]}"; do
-      stat_busy "Starting ${daemon_name}"
-      /usr/sbin/tincd -n "${net}" $TINCD_EXTRAOPTS &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon ${daemon_name}
-        stat_done
-      fi
-    done
-    ;;
-  stop)
-    stat_busy "Stopping ${daemon_name}"
-    for net in "${NETNAMES[@]}"; do
-      /usr/sbin/tincd -k -n "${net}" &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon ${daemon_name}
-        stat_done
-      fi
-    done
-    ;;
-  restart)
-    "$0" stop
-    sleep 5
-    "$0" start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/tinc/tincd@.service b/community/tinc/tincd@.service
index ef8f2da9f..069bf4570 100644
--- a/community/tinc/tincd@.service
+++ b/community/tinc/tincd@.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/tincd -n %i
+ExecStart=/usr/bin/tincd -n %i
 
 [Install]
 WantedBy=multi-user.target