Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=73c13ceada72ff0bce545612a46132e0573bbff2
commit 73c13ceada72ff0bce545612a46132e0573bbff2 Author: Miklos Vajna <[email protected]> Date: Thu Nov 15 22:09:54 2012 +0100 openvpn-2.1.3-6-x86_64 - drop sysvinit support diff --git a/source/network-extra/openvpn/FrugalBuild b/source/network-extra/openvpn/FrugalBuild index 4089f67..e1b8928 100644 --- a/source/network-extra/openvpn/FrugalBuild +++ b/source/network-extra/openvpn/FrugalBuild @@ -4,18 +4,16 @@ pkgname=openvpn pkgver=2.1.3 -pkgrel=5 +pkgrel=6 pkgdesc="A secure tunneling daemon" url="http://www.openvpn.org/" depends=('openssl>=1.0.0' 'lzo' 'pam') groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump 'http://openvpn.net/release/?C=M&O=D' |grep -v beta| grep '$pkgname.*.tar.\(gz\|bz2\)' | sed -ne 's|.*$pkgname-\(.*\).tar.*|\1|g;1 p'" -source=(http://www.openvpn.net/release/$pkgname-$pkgver.tar.gz rc.openvpn [email protected]) +source=(http://www.openvpn.net/release/$pkgname-$pkgver.tar.gz [email protected]) sha1sums=('91058e78c58c2e66298c7132bea1ddba52baaa82' \ - '4f0faa66f3562a6a76bdc6f6ed1db96b2ab974de' \ 'c79ce19443d14334600aaaa1caf072490a6e9da0') -_F_sysvinit_units=(openvpn) _F_systemd_units=(openvpn@=) Finclude systemd @@ -29,7 +27,6 @@ build() Fmake Fmkdir usr/lib/openvpn Fcp $pkgname-$pkgver/plugin/auth-pam/openvpn-auth-pam.so /usr/lib/openvpn/ - Frcd # systemd tmpfiles Frm var/run Fmkdir /etc/tmpfiles.d diff --git a/source/network-extra/openvpn/messages/openvpn.de b/source/network-extra/openvpn/messages/openvpn.de deleted file mode 100644 index 31e5ddb..0000000 --- a/source/network-extra/openvpn/messages/openvpn.de +++ /dev/null @@ -1,2 +0,0 @@ -stopvpn="Stoppe OpenVPN Daemon" -startvpn="Starte OpenVPN Daemon" diff --git a/source/network-extra/openvpn/messages/openvpn.en b/source/network-extra/openvpn/messages/openvpn.en deleted file mode 100644 index 3bc5043..0000000 --- a/source/network-extra/openvpn/messages/openvpn.en +++ /dev/null @@ -1,2 +0,0 @@ -stopvpn="Stopping OpenVPN Daemon" -startvpn="Starting OpenVPN Daemon" diff --git a/source/network-extra/openvpn/messages/openvpn.hu b/source/network-extra/openvpn/messages/openvpn.hu deleted file mode 100644 index 0d95bb9..0000000 --- a/source/network-extra/openvpn/messages/openvpn.hu +++ /dev/null @@ -1,2 +0,0 @@ -stopvpn="Az OpenVPN leállítása" -startvpn="Az OpenVPN indítása" diff --git a/source/network-extra/openvpn/rc.openvpn b/source/network-extra/openvpn/rc.openvpn deleted file mode 100644 index b2247da..0000000 --- a/source/network-extra/openvpn/rc.openvpn +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/sh - -# (c) 2003 Vajna Miklos <[email protected]> -# rc.openvpn for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 32 56 -# description: Starts or stops the openvpn daemon - -TEXTDOMAIN=openvpn -TEXTDOMAINDIR=/lib/initscripts/messages -source /lib/initscripts/functions -daemon="openvpn daemon" - -actions=(start stop restart status) - -openvpn="" -openvpn_locations="/usr/sbin/openvpn /usr/local/sbin/openvpn" -for location in $openvpn_locations -do - if [ -f "$location" ] - then - openvpn=$location - fi -done - -# Lockfile -lock="/var/lock/subsys/openvpn" - -# PID directory -piddir="/var/run/openvpn" - -# Our working directory -work=/etc/openvpn - -# Check that binary exists -if ! [ -f $openvpn ] -then - echo "openvpn binary not found" - exit 0 -fi - -rc_stop() -{ - stop_msg - for pidf in `/bin/ls $piddir/*.pid 2>/dev/null`; do - if [ -s $pidf ]; then - kill `cat $pidf` >/dev/null 2>&1 - fi - rm -f $pidf - done - - # Run shutdown script, if defined - if [ -f $work/openvpn-shutdown ]; then - $work/openvpn-shutdown - fi - - rm -f $lock - ok $? -} - -rc_start() -{ - - start_msg - /sbin/modprobe tun >/dev/null 2>&1 - - # From a security perspective, I think it makes - # sense to remove this, and have users who need - # it explictly enable in their --up scripts or - # firewall setups. - - #echo 1 > /proc/sys/net/ipv4/ip_forward - - # Run startup script, if defined - if [ -f $work/openvpn-startup ]; then - $work/openvpn-startup - fi - - if [ ! -d $piddir ]; then - mkdir $piddir - fi - - if [ -f $lock ]; then - # we were not shut down correctly - for pidf in `/bin/ls $piddir/*.pid 2>/dev/null`; do - if [ -s $pidf ]; then - kill `cat $pidf` >/dev/null 2>&1 - fi - rm -f $pidf - done - rm -f $lock - sleep 2 - fi - - rm -f $piddir/*.pid - cd $work - - # Start every .conf in $work and run .sh if exists - errors=0 - successes=0 - for c in `/bin/ls *.conf 2>/dev/null`; do - bn=${c%%.conf} - if [ -f "$bn.sh" ]; then - . $bn.sh - fi - rm -f $piddir/$bn.pid - $openvpn --daemon --writepid $piddir/$bn.pid --config $c --cd $work - done - - ok $? -} - -rc_status() -{ - msg "$daemon are" - if [ -f $lock ]; then - for pidf in `/bin/ls $piddir/*.pid 2>/dev/null`; do - if [ -s $pidf ]; then - # started - ok 997 - return - fi - done - fi - ok 998 - -} -rc_exec $1
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
