Initial commit
This commit is contained in:
Your Name
+48
@@ -0,0 +1,48 @@
|
||||
From ea179d83b0aa62719d90748cd1fb260f40055f15 Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Mon, 13 Jun 2022 22:44:28 +0800
|
||||
Subject: [PATCH] configure.ac: eliminate build path from openvpn --version
|
||||
option
|
||||
|
||||
Before the patch:
|
||||
$ openvpn --version
|
||||
OpenVPN 2.5.7 x86_64-poky-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL]
|
||||
[snip]
|
||||
Compile time defines: enable_async_push=no enable_comp_stub=no
|
||||
[snip]
|
||||
with_crypto_library=openssl with_gnu_ld=yes
|
||||
with_libtool_sysroot=/buildarea/build/tmp/work/core2-64-poky-linux/openvpn/2.5.7-r0/recipe-sysroot
|
||||
with_mem_check=no with_openssl_engine=auto
|
||||
|
||||
After the patch:
|
||||
$ openvpn --version
|
||||
OpenVPN 2.5.7 x86_64-poky-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL]
|
||||
[snip]
|
||||
Compile time defines: enable_async_push=no enable_comp_stub=no
|
||||
[snip]
|
||||
with_crypto_library=openssl with_gnu_ld=yes with_mem_check=no
|
||||
with_openssl_engine=auto
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 2f5f6bc..eddcbc5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1377,7 +1377,7 @@ if test "${enable_async_push}" = "yes"; then
|
||||
esac
|
||||
fi
|
||||
|
||||
-CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*='`"
|
||||
+CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*=' | grep -v 'libtool_sysroot'`"
|
||||
AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings])
|
||||
|
||||
TAP_WIN_COMPONENT_ID="PRODUCT_TAP_WIN_COMPONENT_ID"
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
#!/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>
|
||||
# Modified for respecting pid file on service start by Fabian Klemp <fabian.klemp@axino-group.com>
|
||||
|
||||
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
|
||||
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
|
||||
}
|
||||
|
||||
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:
|
||||
Reference in New Issue
Block a user