diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-04-16 10:53:57 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-19 02:45:27 +0200 |
commit | f1d7f500ac51057bb3337fa2945f5b0cbd93ec6a (patch) | |
tree | 692987d90425fced480884ba00c6499b007bcf8f /meta-oe/recipes-connectivity | |
parent | 21adc5d117329b11fa42da2f62edce3cad8719ff (diff) | |
download | meta-openembedded-f1d7f500ac51057bb3337fa2945f5b0cbd93ec6a.tar.gz |
openvpn: move to meta-networking and tweak
* Move SRC_URI checksums next to SRC_URI
* Move packaging definitions to the end
* Set SUMMARY instead of DESCRIPTION
* Drop unused inc file
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rw-r--r-- | meta-oe/recipes-connectivity/openvpn/openvpn.inc | 22 | ||||
-rwxr-xr-x | meta-oe/recipes-connectivity/openvpn/openvpn/openvpn | 104 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb | 26 |
3 files changed, 0 insertions, 152 deletions
diff --git a/meta-oe/recipes-connectivity/openvpn/openvpn.inc b/meta-oe/recipes-connectivity/openvpn/openvpn.inc deleted file mode 100644 index 61f91a3ea6..0000000000 --- a/meta-oe/recipes-connectivity/openvpn/openvpn.inc +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "A full-featured SSL VPN solution via tun device." -HOMEPAGE = "http://openvpn.sourceforge.net" -SECTION = "console/network" -LICENSE = "GPLv2" -DEPENDS = "lzo openssl" -RRECOMMENDS_${PN} = "kernel-module-tun" - -INC_PR = "r2" - -SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ - file://openvpn" -S = "${WORKDIR}/openvpn-${PV}" - -CFLAGS += "-fno-inline" - -inherit autotools - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -d ${D}/${sysconfdir}/openvpn - install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d -} diff --git a/meta-oe/recipes-connectivity/openvpn/openvpn/openvpn b/meta-oe/recipes-connectivity/openvpn/openvpn/openvpn deleted file mode 100755 index a3cd6a2f49..0000000000 --- a/meta-oe/recipes-connectivity/openvpn/openvpn/openvpn +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh -e -# -# Original version by Robert Leslie -# <rob@mars.org>, edited by iwj and cs -# Modified for openvpn by Alberto Gonzalez Iniesta <agi@agi.as> -# Modified for restarting / starting / stopping single tunnels by Richard Mueller <mueller@teamix.net> - -test $DEBIAN_SCRIPT_DEBUG && set -v -x - -DAEMON=/usr/sbin/openvpn -CONFIG_DIR=/etc/openvpn -test -x $DAEMON || exit 0 -test -d $CONFIG_DIR || exit 0 - -start_vpn () { - modprobe tun >/dev/null 2>&1 || true - $DAEMON --daemon --writepid /var/run/openvpn.$NAME.pid \ - --config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR || echo -n " FAILED->" - echo -n " $NAME" -} -stop_vpn () { - kill `cat $PIDFILE` || true - rm $PIDFILE -} - -case "$1" in -start) - echo -n "Starting openvpn:" - - if test -z $2 ; then - for CONFIG in `cd $CONFIG_DIR; ls *.conf 2> /dev/null`; do - NAME=${CONFIG%%.conf} - start_vpn - done - else - if test -e $CONFIG_DIR/$2.conf ; then - NAME=$2 - start_vpn - else - echo -n " No such VPN: $2" - fi - fi - echo "." - - ;; -stop) - echo -n "Stopping openvpn:" - - if test -z $2 ; then - for PIDFILE in `ls /var/run/openvpn.*.pid 2> /dev/null`; do - NAME=`echo $PIDFILE | cut -c18-` - NAME=${NAME%%.pid} - stop_vpn - echo -n " $NAME" - done - else - if test -e /var/run/openvpn.$2.pid ; then - PIDFILE=`ls /var/run/openvpn.$2.pid 2> /dev/null` - NAME=`echo $PIDFILE | cut -c18-` - NAME=${NAME%%.pid} - stop_vpn - echo -n " $NAME" - else - echo -n " No such VPN: $2" - fi - fi - echo "." - ;; -# We only 'reload' for running VPNs. New ones will only start with 'start' or 'restart'. -reload|force-reload) - echo -n "Reloading openvpn:" - for PIDFILE in `ls /var/run/openvpn.*.pid 2> /dev/null`; do - NAME=`echo $PIDFILE | cut -c18-` - NAME=${NAME%%.pid} -# If openvpn if running under a different user than root we'll need to restart - if egrep '^( |\t)*user' $CONFIG_DIR/$NAME.conf > /dev/null 2>&1 ; then - stop_vpn - sleep 1 - start_vpn - echo -n "(restarted)" - else - kill -HUP `cat $PIDFILE` || true -# start-stop-daemon --stop --signal HUP --quiet --oknodo \ -# --exec $DAEMON --pidfile $PIDFILE - echo -n " $NAME" - fi - done - echo "." - ;; - -restart) - $0 stop $2 - sleep 1 - $0 start $2 - ;; -*) - echo "Usage: $0 {start|stop|reload|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 - -# vim:set ai et sts=2 sw=2 tw=0: diff --git a/meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb b/meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb deleted file mode 100644 index 594b2666c8..0000000000 --- a/meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "A full-featured SSL VPN solution via tun device." -HOMEPAGE = "http://openvpn.sourceforge.net" -SECTION = "console/network" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c" -DEPENDS = "lzo openssl" -RRECOMMENDS_${PN} = "kernel-module-tun" - -inherit autotools - -SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ - file://openvpn" - -CFLAGS += "-fno-inline" - -# I want openvpn to be able to read password from file (hrw) -EXTRA_OECONF += "--enable-password-save" - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -d ${D}/${sysconfdir}/openvpn - install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d -} - -SRC_URI[md5sum] = "7486d3e270ba4b033e311d3e022a0ad7" -SRC_URI[sha256sum] = "5185181df2e6043bd667377bc92e36ea5a5bd7600af209654f109b6403ca5b36" |