From 55f64448225ef216155cc0560c802b02f8ba6646 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 28 Dec 2012 13:55:40 +0100
Subject: [PATCH] connman: update to connman-1.10

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/connman/build                |  2 +-
 packages/network/connman/install              | 19 +++++++++++++++++++
 packages/network/connman/meta                 |  2 +-
 ... connman-1.10-do-not-cleanup-routes.patch} |  0
 4 files changed, 21 insertions(+), 2 deletions(-)
 rename packages/network/connman/patches/{connman-1.9-do-not-cleanup-routes.patch => connman-1.10-do-not-cleanup-routes.patch} (100%)

diff --git a/packages/network/connman/build b/packages/network/connman/build
index 5fb935c068..9f46026db1 100755
--- a/packages/network/connman/build
+++ b/packages/network/connman/build
@@ -27,7 +27,7 @@ if [ "$PPTP_SUPPORT" = yes ]; then
   export PPPD="/usr/sbin/pppd"
   export PPTP="/usr/sbin/pptp"
 else
-  CONNMAN_PPP="--disable-pptp"
+  CONNMAN_PPTP="--disable-pptp"
 fi
 
 if [ "$OPENVPN_SUPPORT" = yes ]; then
diff --git a/packages/network/connman/install b/packages/network/connman/install
index 875465ea60..c7added2b3 100755
--- a/packages/network/connman/install
+++ b/packages/network/connman/install
@@ -51,3 +51,22 @@ mkdir -p $INSTALL/usr/sbin
 
 mkdir -p $INSTALL/usr/config
   cp $PKG_DIR/config/hosts.conf $INSTALL/usr/config
+
+if [ "$PPTP_SUPPORT" = yes -o "$OPENVPN_SUPPORT" = yes ]; then
+  mkdir -p $INSTALL/etc/dbus-1/system.d
+    cp $PKG_BUILD/vpn/connman-vpn-dbus.conf $INSTALL/etc/dbus-1/system.d
+
+  mkdir -p $INSTALL/usr/lib/connman/plugins-vpn
+    cp -P $PKG_BUILD/vpn/plugins/.libs/*.so $INSTALL/usr/lib/connman/plugins-vpn || true
+
+  mkdir -p $INSTALL/usr/sbin
+    cp -P $PKG_BUILD/vpn/connman-vpnd $INSTALL/usr/sbin
+
+  mkdir -p $INSTALL/usr/share/dbus-1/system-services
+    cp -P $PKG_BUILD/vpn/net.connman.vpn.service $INSTALL/usr/share/dbus-1/system-services
+fi
+
+if [ "$OPENVPN_SUPPORT" = yes ]; then
+  mkdir -p $INSTALL/usr/lib/connman/scripts
+    cp -P $PKG_BUILD/scripts/openvpn-script $INSTALL/usr/lib/connman/scripts
+fi
diff --git a/packages/network/connman/meta b/packages/network/connman/meta
index bfab7a6b5f..400cf2e491 100644
--- a/packages/network/connman/meta
+++ b/packages/network/connman/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="1.9"
+PKG_VERSION="1.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/network/connman/patches/connman-1.9-do-not-cleanup-routes.patch b/packages/network/connman/patches/connman-1.10-do-not-cleanup-routes.patch
similarity index 100%
rename from packages/network/connman/patches/connman-1.9-do-not-cleanup-routes.patch
rename to packages/network/connman/patches/connman-1.10-do-not-cleanup-routes.patch