[Lunar-commits] <moonbase> connman-git: bring DEPEND and CONFIGURE up to date

[Zachary McGrew]

commit dadd0dc52d43343a9f47f8a8aa59148f4e44ed0a
Author: Zachary McGrew <zmcgrew at lunar-linux.org>
Date:   Thu Apr 19 21:30:50 2012 -0700

    connman-git: bring DEPEND and CONFIGURE up to date
    
    This brings it in line with normal released version.
    Also adds a couple of new CONFIGURE optionss.
---
 zbeta/connman-git/BUILD                     |    2 +-
 zbeta/connman-git/CONFIGURE                 |    7 +++++++
 zbeta/connman-git/DEPENDS                   |   17 ++++++++++++++---
 zbeta/connman-git/POST_INSTALL              |    6 ++++++
 zbeta/connman-git/systemd.d/connman.service |   12 ++++++++++++
 5 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/zbeta/connman-git/BUILD b/zbeta/connman-git/BUILD
index db1729a..a6f7ef5 100644
--- a/zbeta/connman-git/BUILD
+++ b/zbeta/connman-git/BUILD
@@ -1,7 +1,7 @@
 (
 
   sh bootstrap &&
-  OPTS+=" --enable-pie --enable-threads --enable-loopback --enable-ethernet --enable-wifi --enable-bluetooth --enable-ofono --enable-modemmgr --enable-udhcp --enable-dhclient --enable-resolvconf --enable-dnsproxy --enable-novatel --enable-huawei --enable-hso --enable-mbm --enable-ppp  --enable-iospm --enable-polkit"
+  OPTS+=" --enable-ethernet --enable-loopback --enable-client --enable-pie --enable-threads --enable-tools" &&
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/zbeta/connman-git/CONFIGURE b/zbeta/connman-git/CONFIGURE
new file mode 100644
index 0000000..93efd9a
--- /dev/null
+++ b/zbeta/connman-git/CONFIGURE
@@ -0,0 +1,7 @@
+mquery ENBL_OSPM "Enable Intel OSPM support?" y "--enable-iospm" "--disable-iospm"
+mquery ENBL_TEST "Enable test/example scripts?" y "--enable-test" "--disable-test"
+mquery ENBL_FAKE "Enable fake device support?" y "--enable-fake" "--disable-fake"
+mquery ENBL_TIST "Enable TI Shared Transport support for WiLink Chipsets (Bluetooth, FM and GPS)?" y "--enable-tist" "--disable-tist"
+mquery ENBL_SER_GPS "Enable hh2serial GPS support?" y "--enable-hh2serial-gps" "--disable-hh2serial-gps"
+mquery ENBL_PAC "Enable PAC runner support?" y "--enable-pacrunner" "--disable-pacrunner"
+mquery ENBL_NM "Enable NetworkManager compatibility?" y "--enable-nmcompat" "--disable-nmcompat"
diff --git a/zbeta/connman-git/DEPENDS b/zbeta/connman-git/DEPENDS
index 7406223..2f4a6bc 100644
--- a/zbeta/connman-git/DEPENDS
+++ b/zbeta/connman-git/DEPENDS
@@ -1,3 +1,14 @@
-depends dhcp
-depends resolvconf
-depends wpa_supplicant
+depends dbus
+depends glib-2
+#depends dhcp
+#depends resolvconf
+
+optional_depends "wpa_supplicant" "--enable-wifi"        "--disable-wifi"        "for WiFi device support"
+optional_depends "openconnect"    "--enable-openconnect" "--disable-openconnect" "for Cisco's AnyConnect SSL VPN support"
+optional_depends "ofono"          "--enable-ofono"       "--disable-ofono"       "Enable phone support"
+optional_depends "bluez"          "--enable-bluetooth"   "--disable-bluetooth"   "for Bluetooth device support"
+optional_depends "polkit"         "--enable-polkit"      "--disable-polkit"      "for PolicyKit authorization support"
+optional_depends "xl2tpd"         "--enable-l2tp"        "--disable-l2tp"        "For Layer 2 Tunneling support (VPN)"
+optional_depends "openvpn"        "--enable-openvpn"     "--disable-openvpn"     "for Virtual Private Network support"
+optional_depends "pptp"           "--enable-pptp"        "--disable-pptp"        "for Virtual Private Network support"
+optional_depends "libcap-ng"      "--enable-capng"       "--disable-capng"       "for additional capabilities support"
diff --git a/zbeta/connman-git/POST_INSTALL b/zbeta/connman-git/POST_INSTALL
new file mode 100644
index 0000000..79e8a79
--- /dev/null
+++ b/zbeta/connman-git/POST_INSTALL
@@ -0,0 +1,6 @@
+if [ "$(/usr/lib/connman/test/get-state | grep "System is online")" != "System is online" ] ; then
+    message "Connamn is online"
+   else
+    /usr/lib/connman/test/test-connman enable wifi
+    /usr/lib/connman/test/test-connman enable ethernet
+fi
diff --git a/zbeta/connman-git/systemd.d/connman.service b/zbeta/connman-git/systemd.d/connman.service
new file mode 100644
index 0000000..d5e778b
--- /dev/null
+++ b/zbeta/connman-git/systemd.d/connman.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Connection service
+Requires=wpa_supplicant.service
+After=syslog.target
+
+[Service]
+Type=dbus
+BusName=net.connman
+ExecStart=/usr/sbin/connmand -n
+
+[Install]
+WantedBy=multi-user.target