From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 28 Oct 2014 10:58:42 +0000 (+0100)
Subject: openconnect: forward SIGINT to app
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a412f2cc4687534b336ae87a98315270fb8f52f4;p=feed%2Fpackages.git

openconnect: forward SIGINT to app

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
---

diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile
index 9fd40d6482..c14dd32a6f 100644
--- a/net/openconnect/Makefile
+++ b/net/openconnect/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openconnect
 PKG_VERSION:=6.00
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/
diff --git a/net/openconnect/files/openconnect-wrapper b/net/openconnect/files/openconnect-wrapper
index 744e5a5cd0..082dfba73a 100755
--- a/net/openconnect/files/openconnect-wrapper
+++ b/net/openconnect/files/openconnect-wrapper
@@ -22,7 +22,17 @@ cleanup()
 	exit 0
 }
 
-trap cleanup 1 2 3 6 15
+cleanup2()
+{
+	if ! test -z "$pid";then
+		kill -2 $pid
+		wait $pid
+	fi
+	exit 0
+}
+
+trap cleanup2 2
+trap cleanup 1 3 6 15
 
 rm -f "$pidfile"
 /usr/sbin/openconnect $* <$pwfile &