connman: add optional PPTP support

Signed-off-by: Stephan Raue <[email protected]>
Nachtzuster · Aug 17, 2012 · 9ec1f7e · 9ec1f7e
1 parent 6770357
commit 9ec1f7e
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -13,6 +13,7 @@ Package updates:
 
 Added functions:
   - sshd can be enabled via OpenELEC Settings addon
+  - add PPTP support
 
 Changed functions:
 

diff --git a/packages/network/connman/build b/packages/network/connman/build
@@ -22,6 +22,14 @@
 
 . config/options $1
 
+if [ "$PPTP_SUPPORT" = yes ]; then
+  CONNMAN_PPTP="--enable-pptp"
+  export PPPD="/usr/sbin/pppd"
+  export PPTP="/usr/sbin/pptp"
+else
+  CONNMAN_PPP="--disable-pptp"
+fi
+
 export WPASUPPLICANT="/usr/bin/wpa_supplicant"
 
 cd $PKG_BUILD
@@ -47,7 +55,7 @@ cd $PKG_BUILD
             --disable-openvpn \
             --disable-vpnc \
             --disable-l2tp \
-            --disable-pptp \
+            $CONNMAN_PPTP \
             --disable-tist \
             --disable-pacrunner \
             --disable-iwmx \

diff --git a/packages/network/connman/install b/packages/network/connman/install
@@ -41,6 +41,9 @@ mkdir -p $INSTALL/usr/bin
 mkdir -p $INSTALL/usr/lib/connman
   cp -P $PKG_BUILD/test/* $INSTALL/usr/lib/connman
 
+mkdir -p $INSTALL/usr/lib/connman/scripts
+  cp -P $PKG_BUILD/scripts/.libs/*.so* $INSTALL/usr/lib/connman/scripts
+
 mkdir -p $INSTALL/usr/sbin
   cp -P $PKG_BUILD/src/connmand $INSTALL/usr/sbin
 

diff --git a/packages/network/connman/meta b/packages/network/connman/meta
@@ -34,3 +34,8 @@ 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="$PKG_DEPENDS ppp pptp"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS ppp pptp"
+fi
diff --git a/projects/ATV/options b/projects/ATV/options
@@ -211,6 +211,9 @@
 # build and install SSH Guard (yes / no)
   SSHGUARD_SUPPORT="yes"
 
+# build and install PPP support (yes / no)
+  PPTP_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

diff --git a/projects/Fusion/options b/projects/Fusion/options
@@ -210,6 +210,9 @@
 # build and install SSH Guard (yes / no)
   SSHGUARD_SUPPORT="yes"
 
+# build and install PPP support (yes / no)
+  PPTP_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

diff --git a/projects/Generic/options b/projects/Generic/options
@@ -210,6 +210,9 @@
 # build and install SSH Guard (yes / no)
   SSHGUARD_SUPPORT="yes"
 
+# build and install PPP support (yes / no)
+  PPTP_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
@@ -210,6 +210,9 @@
 # build and install SSH Guard (yes / no)
   SSHGUARD_SUPPORT="yes"
 
+# build and install PPP support (yes / no)
+  PPTP_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

diff --git a/projects/ION/options b/projects/ION/options
@@ -210,6 +210,9 @@
 # build and install SSH Guard (yes / no)
   SSHGUARD_SUPPORT="yes"
 
+# build and install PPP support (yes / no)
+  PPTP_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

diff --git a/projects/Intel/options b/projects/Intel/options
@@ -210,6 +210,9 @@
 # build and install SSH Guard (yes / no)
   SSHGUARD_SUPPORT="yes"
 
+# build and install PPP support (yes / no)
+  PPTP_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

diff --git a/projects/RPi/options b/projects/RPi/options
@@ -212,6 +212,9 @@
 # build and install SSH Guard (yes / no)
   SSHGUARD_SUPPORT="no"
 
+# build and install PPP support (yes / no)
+  PPTP_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

diff --git a/projects/Ultra/options b/projects/Ultra/options
@@ -210,6 +210,9 @@
 # build and install SSH Guard (yes / no)
   SSHGUARD_SUPPORT="yes"
 
+# build and install PPP support (yes / no)
+  PPTP_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)

diff --git a/projects/Virtual/options b/projects/Virtual/options
@@ -206,6 +206,9 @@
 # build and install SSH Guard (yes / no)
   SSHGUARD_SUPPORT="yes"
 
+# build and install PPP support (yes / no)
+  PPTP_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)