From 83e79ce766e15c5ca26fca78ce026a4d3a5ed683 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 11 Jan 2015 16:51:01 +0200
Subject: [PATCH] connman: remove vpn support

---
 packages/network/connman/package.mk           | 19 ++-----------------
 .../connman/system.d/connman-vpn.service      | 14 --------------
 .../connman/tmpfiles.d/z_03_connman.conf      |  1 -
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 packages/network/connman/system.d/connman-vpn.service

diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk
index d9a5f85ce0..0dfb382bf3 100644
--- a/packages/network/connman/package.mk
+++ b/packages/network/connman/package.mk
@@ -33,29 +33,15 @@ PKG_LONGDESC="The ConnMan project provides a daemon for managing internet connec
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-if [ "$PPTP_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET ppp pptp"
-  CONNMAN_PPTP="--enable-pptp PPPD=/usr/sbin/pppd PPTP=/usr/sbin/pptp"
-else
-  CONNMAN_PPTP="--disable-pptp"
-fi
-
-if [ "$OPENVPN_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET openvpn"
-  CONNMAN_OPENVPN="--enable-openvpn --with-openvpn=/usr/sbin/openvpn"
-else
-  CONNMAN_OPENVPN="--disable-openvpn"
-fi
-
 PKG_CONFIGURE_OPTS_TARGET="WPASUPPLICANT=/usr/bin/wpa_supplicant \
                            --disable-gtk-doc \
                            --disable-debug \
                            --disable-hh2serial-gps \
                            --disable-openconnect \
-                           $CONNMAN_OPENVPN \
+                           --disable-openvpn \
                            --disable-vpnc \
                            --disable-l2tp \
-                           $CONNMAN_PPTP \
+                           --disable-pptp \
                            --disable-iospm \
                            --disable-tist \
                            --disable-session-policy-local \
@@ -82,7 +68,6 @@ PKG_CONFIGURE_OPTS_TARGET="WPASUPPLICANT=/usr/bin/wpa_supplicant \
 
 
 PKG_MAKE_OPTS_TARGET="storagedir=/storage/.cache/connman \
-                      vpn_storagedir=/storage/.config/vpn-config \
                       statedir=/run/connman"
 
 post_makeinstall_target() {
diff --git a/packages/network/connman/system.d/connman-vpn.service b/packages/network/connman/system.d/connman-vpn.service
deleted file mode 100644
index 54c0ab4bcc..0000000000
--- a/packages/network/connman/system.d/connman-vpn.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=ConnMan VPN service
-Requires=dbus.socket
-After=dbus.socket
-
-[Service]
-Type=dbus
-BusName=net.connman.vpn
-EnvironmentFile=-/run/openelec/debug/connman.conf
-ExecStart=/usr/sbin/connman-vpnd -n $CONNMANVPN_DEBUG
-StandardOutput=null
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packages/network/connman/tmpfiles.d/z_03_connman.conf b/packages/network/connman/tmpfiles.d/z_03_connman.conf
index 9937675496..cdc18d8b8e 100644
--- a/packages/network/connman/tmpfiles.d/z_03_connman.conf
+++ b/packages/network/connman/tmpfiles.d/z_03_connman.conf
@@ -18,4 +18,3 @@
 
 d    /run/connman                0755 root root - -
 d    /storage/.cache/connman     0755 root root - -
-d    /storage/.config/vpn-config 0755 root root - -