[arch-commits] Commit in openvpn/trunk (5 files)
Pierre Schmitz
pierre at nymeria.archlinux.org
Fri May 31 08:11:57 UTC 2013
Date: Friday, May 31, 2013 @ 10:11:57
Author: pierre
Revision: 186795
upgpkg: openvpn 2.3.1-2
move binary to /usr/bin
Modified:
openvpn/trunk/PKGBUILD
openvpn/trunk/openvpn at .service
Deleted:
openvpn/trunk/openvpn-tapdev.conf
openvpn/trunk/openvpn-tapdev.rc
openvpn/trunk/openvpn.rc
---------------------+
PKGBUILD | 5 +++--
openvpn-tapdev.conf | 12 ------------
openvpn-tapdev.rc | 40 ----------------------------------------
openvpn.rc | 43 -------------------------------------------
openvpn at .service | 2 +-
5 files changed, 4 insertions(+), 98 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-31 08:01:32 UTC (rev 186794)
+++ PKGBUILD 2013-05-31 08:11:57 UTC (rev 186795)
@@ -3,7 +3,7 @@
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 @@
'SKIP'
'fbf818b6e1f212e77b9ce0e6d92584a1'
'SKIP'
- '0846aa59d0b123d61030890f9a4135ae'
+ '57ef7353ba2c28c04dfc387c3ca77a4f'
'e1bd1523e38745e948c710db1a330bb1')
options=(!libtool)
@@ -32,6 +32,7 @@
# Build openvpn
CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \
--prefix=/usr \
+ --sbindir=/usr/bin \
--enable-password-save \
--mandir=/usr/share/man \
--enable-iproute2 \
Deleted: openvpn-tapdev.conf
===================================================================
--- openvpn-tapdev.conf 2013-05-31 08:01:32 UTC (rev 186794)
+++ openvpn-tapdev.conf 2013-05-31 08:11:57 UTC (rev 186795)
@@ -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=""
Deleted: openvpn-tapdev.rc
===================================================================
--- openvpn-tapdev.rc 2013-05-31 08:01:32 UTC (rev 186794)
+++ openvpn-tapdev.rc 2013-05-31 08:11:57 UTC (rev 186795)
@@ -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
Deleted: openvpn.rc
===================================================================
--- openvpn.rc 2013-05-31 08:01:32 UTC (rev 186794)
+++ openvpn.rc 2013-05-31 08:11:57 UTC (rev 186795)
@@ -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
Modified: openvpn at .service
===================================================================
--- openvpn at .service 2013-05-31 08:01:32 UTC (rev 186794)
+++ openvpn at .service 2013-05-31 08:11:57 UTC (rev 186795)
@@ -4,7 +4,7 @@
[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
More information about the arch-commits
mailing list