Tue Jun 4 00:27:56 PDT 2013

5 files changed, 5 insertions, 99 deletions

diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD
index 3b79a7ab8..7c63db027 100644
--- a/core/openvpn/PKGBUILD
+++ b/core/openvpn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184228 2013-05-04 14:17:41Z thomas $
+# $Id: PKGBUILD 187038 2013-06-03 11:15:29Z allan $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=openvpn
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
 arch=(i686 x86_64)
 url="http://openvpn.net/index.php/open-source.html"
@@ -22,7 +22,7 @@ md5sums=('57a3b64597fc37b7842a3fde354d8bbe'
          'SKIP'
          'fbf818b6e1f212e77b9ce0e6d92584a1'
          'SKIP'
-         '0846aa59d0b123d61030890f9a4135ae'
+         '57ef7353ba2c28c04dfc387c3ca77a4f'
          'e1bd1523e38745e948c710db1a330bb1')
 options=(!libtool)
 
@@ -32,6 +32,7 @@ build() {
   # Build openvpn
   CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \
     --prefix=/usr \
+    --sbindir=/usr/bin \
     --enable-password-save \
     --mandir=/usr/share/man \
     --enable-iproute2 \
diff --git a/core/openvpn/openvpn-tapdev.conf b/core/openvpn/openvpn-tapdev.conf
deleted file mode 100644
index afa5586dd..000000000
--- a/core/openvpn/openvpn-tapdev.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# /etc/conf.d/openvpn-tapdev
-#
-# Place openvpn-tapdev before network into your DAEMONS array
-# This will create permanent tap devices which you can use for bridging
-#
-# Example:
-# TAPDEVS="work home"
-# Will create two tap devices "work" and "home"
-#
-
-TAPDEVS=""
diff --git a/core/openvpn/openvpn-tapdev.rc b/core/openvpn/openvpn-tapdev.rc
deleted file mode 100755
index 2c51f8248..000000000
--- a/core/openvpn/openvpn-tapdev.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/openvpn-tapdev
-
-case "$1" in
-  start)
-    stat_busy "Creating tap devices for OpenVPN ... "
-    success=0
-    for tapdev in ${TAPDEVS}; do
-      stat_append "${tapdev} "
-      /usr/sbin/openvpn --mktun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$?
-    done
-    if [ $success -eq 0 ]; then
-      add_daemon openvpn-tapdev
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Destroying tap devices for OpenVPN ..."
-    for tapdev in ${TAPDEVS}; do
-      stat_append "${tapdev} "
-      /usr/sbin/openvpn --rmtun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$?
-    done
-    rm_daemon openvpn-tapdev
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/core/openvpn/openvpn.rc b/core/openvpn/openvpn.rc
deleted file mode 100755
index 96c28b641..000000000
--- a/core/openvpn/openvpn.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-CFGDIR="/etc/openvpn"
-STATEDIR="/var/run/openvpn"
-
-case "$1" in
-  start)
-    stat_busy "Starting OpenVPN ... "
-    success=0
-    mkdir -p "${STATEDIR}"
-    for cfg in "${CFGDIR}"/*.conf; do
-      stat_append "$(basename "${cfg}" .conf) "
-      /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$?
-    done
-    if [ $success -eq 0 ]; then
-      add_daemon openvpn
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OpenVPN ..."
-    for pidfile in "${STATEDIR}"/*.pid; do
-      stat_append "$(basename "${pidfile}" .pid) "
-      kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null
-      rm -f "${pidfile}"
-    done
-    rm_daemon openvpn
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/core/openvpn/openvpn@.service b/core/openvpn/openvpn@.service
index 0b7232899..63fdf0e36 100644
--- a/core/openvpn/openvpn@.service
+++ b/core/openvpn/openvpn@.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i
+ExecStart=/usr/bin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i
 
 [Install]
 WantedBy=multi-user.target