diff options
Diffstat (limited to 'external/meta-openembedded/meta-networking/recipes-support/openvpn')
| -rwxr-xr-x | external/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn | 12 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.9.bb (renamed from external/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.6.bb) | 8 |
2 files changed, 15 insertions, 5 deletions
diff --git a/external/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn b/external/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn index a3cd6a2f..e5af4b23 100755 --- a/external/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn +++ b/external/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn @@ -4,6 +4,7 @@ # <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> +# Modified for respecting pid file on service start by Fabian Klemp <fabian.klemp@axino-group.com> test $DEBIAN_SCRIPT_DEBUG && set -v -x @@ -14,10 +15,17 @@ 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->" + start-stop-daemon --start --quiet --pidfile /var/run/openvpn.$NAME.pid \ + --exec $DAEMON -- \ + --daemon --writepid /var/run/openvpn.$NAME.pid \ + --config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR || rc="$?" + case $rc in + 1) echo -n " ALREADY STARTED->";; + 3) echo -n " FAILED->";; + esac echo -n " $NAME" } + stop_vpn () { kill `cat $PIDFILE` || true rm $PIDFILE diff --git a/external/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.6.bb b/external/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.9.bb index 84fd467c..529e3912 100644 --- a/external/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.6.bb +++ b/external/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.9.bb @@ -1,5 +1,5 @@ SUMMARY = "A full-featured SSL VPN solution via tun device." -HOMEPAGE = "http://openvpn.sourceforge.net" +HOMEPAGE = "https://openvpn.net/" SECTION = "net" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba" @@ -12,8 +12,10 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ file://openvpn@.service \ file://openvpn-volatile.conf" -SRC_URI[md5sum] = "971d57e29b78b4b902eb2f4aae2f05a7" -SRC_URI[sha256sum] = "738dbd37fcf8eb9382c53628db22258c41ba9550165519d9200e8bebaef4cbe2" +UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" + +SRC_URI[md5sum] = "52863fa9b98e5a3d7f8bec1d5785a2ba" +SRC_URI[sha256sum] = "46b268ef88e67ca6de2e9f19943eb9e5ac8544e55f5c1f3af677298d03e64b6e" SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" SYSTEMD_AUTO_ENABLE = "disable" |