[PATCH 0/4] Upgrade connman to 1.0

[PATCH 0/4] Upgrade connman to 1.0

[Ross Burton]

Below is a patch set upgrading connman to 1.0, and cleaning up the packaging somewhat.

It Works For Me, but my current available hardware is limited to qemux86 and
a headless Atom machine.  In particular the non-root-X permission changes
look to be correct (where they were previously obviously wrong) but I
haven't verified that they work.  Also the packaging has changed quite
dramatically since <0.79 becaus what used to be plugins is now in the core,
which has the potential to break any explicit dependencies on the plugin
packages.  I've added suitable RPROVIDES which should mitigate that.

(note that this is against poky master, not oe-core)

Ross

The following changes since commit f28209d9d3c67203a2c7a2b25cacfe31643d1bfa:

  cooker.py: terminate the Parser processes (2012-05-25 11:39:33 +0100)

are available in the git repository at:
  git://git.yoctoproject.org/poky-contrib ross/connman
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=connman

Ross Burton (4):
  connman: just give xuser the extra rights it needs
  connman: remove a deliberate sed that breaks all DBus access control
    for connman
  connman: respect the 3g feature and enable/disable ofono support
  connman: upgrade to 1.0

 meta/recipes-connectivity/connman/connman.inc      |   34 +++++++-----
 ...ange-visibility-to-default-for-debug-symb.patch |   35 ------------
 .../connman/add_xuser_dbus_permission.patch        |   14 ++---
 .../connman/connman/disable_alg-test.patch         |   46 ----------------
 .../connman/connman/ethernet_default.patch         |   22 --------
 .../connman/test-set-ipv4-method-api-fix.patch     |   50 ------------------
 .../connman/test-set-ipv6-method-api-fix.patch     |   55 --------------------
 meta/recipes-connectivity/connman/connman_0.79.bb  |   14 -----
 meta/recipes-connectivity/connman/connman_1.0.bb   |    9 +++
 9 files changed, 34 insertions(+), 245 deletions(-)
 delete mode 100644 meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/disable_alg-test.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/ethernet_default.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman_0.79.bb
 create mode 100644 meta/recipes-connectivity/connman/connman_1.0.bb

-- 
1.7.7.6

[PATCH 1/4] connman: just give xuser the extra rights it needs

[Ross Burton]

---
 .../connman/add_xuser_dbus_permission.patch        |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
index aa7a910..707b3ca 100644
--- a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
+++ b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
@@ -1,24 +1,20 @@
-Some platform (like atom-pc) enables rootless X,
-thus we need to add the xuser in the list.
+Because Poky doesn't support at_console we need to special-case the session
+user.
 
 Upstream-Status: Inappropriate [configuration]
 
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+Signed-off-by: Ross Burton <ross.burton@intel.com>
 
 diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf
-index 98a773e..cbe2ba3 100644
+index 98a773e..466809c 100644
 --- a/src/connman-dbus.conf
 +++ b/src/connman-dbus.conf
-@@ -8,6 +8,13 @@
+@@ -8,6 +8,9 @@
          <allow send_interface="net.connman.Counter"/>
          <allow send_interface="net.connman.Notification"/>
      </policy>
 +    <policy user="xuser">
-+        <allow own="net.connman"/>
 +        <allow send_destination="net.connman"/>
-+        <allow send_interface="net.connman.Agent"/>
-+        <allow send_interface="net.connman.Counter"/>
-+        <allow send_interface="net.connman.Notification"/>
 +    </policy>
      <policy at_console="true">
          <allow send_destination="net.connman"/>
-- 
1.7.7.6

[PATCH 2/4] connman: remove a deliberate sed that breaks all DBus access control for connman

[Ross Burton]

---
 meta/recipes-connectivity/connman/connman.inc |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index f2da8d9..b6b0253 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -53,10 +53,6 @@ USERADD_PARAM_${PN} = "--system --no-create-home \
 
 inherit autotools pkgconfig update-rc.d useradd
 
-do_compile_append() {
-	sed -i -e s:deny:allow:g src/connman-dbus.conf
-}
-
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
-- 
1.7.7.6

[PATCH 3/4] connman: respect the 3g feature and enable/disable ofono support

[Ross Burton]

[YOCTO #2357]
---
 meta/recipes-connectivity/connman/connman.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index b6b0253..28f5f00 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
 DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)} \
             ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
-            ofono \
+            ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
 TIST = "--enable-tist"
@@ -34,7 +34,7 @@ EXTRA_OECONF += "\
     ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
     ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
     --enable-dnsproxy \
-    --enable-ofono \
+    ${@base_contains('DISTRO_FEATURES', '3g', '', '--disable-ofono', d)} \
     --enable-tools \
     --enable-test \
     --disable-polkit \
-- 
1.7.7.6

[PATCH 4/4] connman: upgrade to 1.0

[Ross Burton]

Drop all upstreamed or irrelevant patches, remove unused configure arguments,
and add compatibility rprovides for what used to be plugins but are now
integrated into the core.
---
 meta/recipes-connectivity/connman/connman.inc      |   26 ++++++---
 ...ange-visibility-to-default-for-debug-symb.patch |   35 ------------
 .../connman/connman/disable_alg-test.patch         |   46 ----------------
 .../connman/connman/ethernet_default.patch         |   22 --------
 .../connman/test-set-ipv4-method-api-fix.patch     |   50 ------------------
 .../connman/test-set-ipv6-method-api-fix.patch     |   55 --------------------
 meta/recipes-connectivity/connman/connman_0.79.bb  |   14 -----
 meta/recipes-connectivity/connman/connman_1.0.bb   |    9 +++
 8 files changed, 27 insertions(+), 230 deletions(-)
 delete mode 100644 meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/disable_alg-test.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/ethernet_default.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman_0.79.bb
 create mode 100644 meta/recipes-connectivity/connman/connman_1.0.bb

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 28f5f00..5138508 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -11,7 +11,7 @@ HOMEPAGE = "http://connman.net/"
 BUGTRACKER = "http://bugs.meego.com/buglist.cgi?quicksearch=connman"
 LICENSE  = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
-                    file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e"
+                    file://src/main.c;beginline=1;endline=20;md5=d6a1ac98a6791c5294e8a7f176ecd66d"
 
 # we need to define the depends here, the dynamic stuff is too late
 DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
@@ -33,14 +33,11 @@ EXTRA_OECONF += "\
     --enable-ethernet \
     ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
     ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
-    --enable-dnsproxy \
     ${@base_contains('DISTRO_FEATURES', '3g', '', '--disable-ofono', d)} \
     --enable-tools \
     --enable-test \
     --disable-polkit \
-    --enable-client \
-    --enable-fake \
-    --disable-ntpd \
+    --disable-client \
 "
 
 INITSCRIPT_NAME = "connman"
@@ -65,13 +62,26 @@ do_install_append() {
 	rmdir ${D}${libdir}/connman/scripts
 }
 
+# These used to be plugins, but now they are core
+RPROVIDES_${PN} = "\
+	connman-plugin-loopback \
+	connman-plugin-ethernet \
+	${@base_contains('DISTRO_FEATURES', 'bluetooth','connman-plugin-bluetooth', '', d)} \
+	${@base_contains('DISTRO_FEATURES', 'wifi','connman-plugin-wifi', '', d)} \
+	${@base_contains('DISTRO_FEATURES', '3g','connman-plugin-ofono', '', d)} \
+	"
+
+RDEPENDS_${PN} = "\
+	${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
+	${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
+	${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
+	"
+
 PACKAGES_DYNAMIC = "${PN}-plugin-*"
 
 python populate_packages_prepend() {
 	depmap = dict( pppd="ppp",
-	               wifi="wpa-supplicant",
-	               bluetooth="bluez4",
-	               ofono="ofono" )
+	       	     )
 	packages = []
 	multilib_prefix = (d.getVar("MLPREFIX", True) or "")
 	hook = lambda file,pkg,b,c,d:packages.append((file,pkg))
diff --git a/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch b/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
deleted file mode 100644
index e6f03e6..0000000
--- a/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4ddaf78dad5a9ee4a0658235f71b75132192123e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 7 Apr 2012 18:52:12 -0700
-Subject: [PATCH] plugin.h: Change visibility to default for debug symbols
-
-gold refuses to link in undefined weak symbols which
-have hidden visibility
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-
-Upstream-Status: Pending
----
- include/plugin.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/plugin.h b/include/plugin.h
-index 692a4e5..a9361c3 100644
---- a/include/plugin.h
-+++ b/include/plugin.h
-@@ -89,9 +89,9 @@ struct connman_plugin_desc {
- #else
- #define CONNMAN_PLUGIN_DEFINE(name, description, version, priority, init, exit) \
- 		extern struct connman_debug_desc __start___debug[] \
--				__attribute__ ((weak, visibility("hidden"))); \
-+				__attribute__ ((weak, visibility("default"))); \
- 		extern struct connman_debug_desc __stop___debug[] \
--				__attribute__ ((weak, visibility("hidden"))); \
-+				__attribute__ ((weak, visibility("default"))); \
- 		extern struct connman_plugin_desc connman_plugin_desc \
- 				__attribute__ ((visibility("default"))); \
- 		struct connman_plugin_desc connman_plugin_desc = { \
--- 
-1.7.5.4
-
diff --git a/meta/recipes-connectivity/connman/connman/disable_alg-test.patch b/meta/recipes-connectivity/connman/connman/disable_alg-test.patch
deleted file mode 100644
index f5cea00..0000000
--- a/meta/recipes-connectivity/connman/connman/disable_alg-test.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 3ebba424d56919018733064ad9e0ab8790d2bf1d Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Fri, 16 Dec 2011 19:31:59 -0200
-Subject: [PATCH] Disable building of alg-test
-
-alg-test utility depends on linux/if_alg.h header that is only
-available on kernels >= 2.6.39.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
----
- Makefile.am  |    2 +-
- configure.ac |    3 ---
- 2 files changed, 1 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index a6509f1..93618a3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -145,7 +145,7 @@ noinst_PROGRAMS += tools/wispr tools/supplicant-test \
- 			tools/dbus-test tools/polkit-test \
- 			tools/iptables-test tools/tap-test tools/wpad-test \
- 			tools/stats-tool tools/private-network-test \
--			tools/alg-test unit/test-session unit/test-ippool \
-+			unit/test-session unit/test-ippool \
- 			unit/test-nat
- 
- tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
-diff --git a/configure.ac b/configure.ac
-index 3dca02e..3b2da4d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -419,9 +419,6 @@ if (test "${enable_tools}" = "yes"); then
- 				AC_MSG_ERROR(GnuTLS library is required))
- 	AC_SUBST(GNUTLS_CFLAGS)
- 	AC_SUBST(GNUTLS_LIBS)
--
--	AC_CHECK_HEADERS(linux/if_alg.h, dummy=yes,
--		AC_MSG_ERROR(User-space algorithm header files are required))
- fi
- AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes")
- 
--- 
-1.7.9.1
-
diff --git a/meta/recipes-connectivity/connman/connman/ethernet_default.patch b/meta/recipes-connectivity/connman/connman/ethernet_default.patch
deleted file mode 100644
index 6dae2aa..0000000
--- a/meta/recipes-connectivity/connman/connman/ethernet_default.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Default to enabling the ethernet interface. If we don't do this, connman
-will shut down all the networking when it starts without any configuration
-which is usualy not what the users expects. This is particularly
-problematic with our qemu images and runtime testing using qemu.
-
-Upstream-Status: Inappropriate [Configuration]
-
-RP 2011/12/12
-
-Index: git/src/storage.c
-===================================================================
---- git.orig/src/storage.c	2011-12-12 16:14:10.892316565 +0000
-+++ git/src/storage.c	2011-12-12 16:14:13.788316431 +0000
-@@ -367,7 +367,7 @@
- 					"Enable", FALSE);
- 
- 		g_key_file_set_boolean(keyfile, "Wired",
--					"Enable", FALSE);
-+					"Enable", TRUE);
- 
- 		g_key_file_set_boolean(keyfile, "3G",
- 					"Enable", FALSE);
diff --git a/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch b/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
deleted file mode 100644
index 78eb19a..0000000
--- a/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0b817dd3096f5c3ca8f0b868ee55ea550054137b Mon Sep 17 00:00:00 2001
-From: Daniel Wagner <daniel.wagner@bmw-carit.de>
-Date: Mon, 19 Mar 2012 14:03:27 +0100
-Subject: [PATCH 3/3] set-ipv4-method: The arguments have to be wrapped into a
- variant
-
-Fixes BMC#24986
-
-Upstream-Status: Backport
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
----
- test/set-ipv4-method |   11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/test/set-ipv4-method b/test/set-ipv4-method
-index 820b24b..235113f 100755
---- a/test/set-ipv4-method
-+++ b/test/set-ipv4-method
-@@ -3,6 +3,9 @@
- import sys
- import dbus
- 
-+def make_variant(string):
-+	return dbus.String(string, variant_level=1)
-+
- def print_usage():
- 	print "Usage: %s <service> [off|dhcp|manual <address> [netmask] [gateway]]" % (sys.argv[0])
- 
-@@ -20,13 +23,13 @@ properties = service.GetProperties()
- 
- print "Setting method %s for %s" % (sys.argv[2], sys.argv[1])
- 
--ipv4_configuration = { "Method": sys.argv[2] }
-+ipv4_configuration = { "Method": make_variant(sys.argv[2]) }
- if (len(sys.argv) > 3):
--	ipv4_configuration["Address"] = sys.argv[3]
-+	ipv4_configuration["Address"] = make_variant(sys.argv[3])
- if (len(sys.argv) > 4):
--	ipv4_configuration["Netmask"] = sys.argv[4]
-+	ipv4_configuration["Netmask"] = make_variant(sys.argv[4])
- if (len(sys.argv) > 5):
--        ipv4_configuration["Gateway"] = sys.argv[5]
-+        ipv4_configuration["Gateway"] = make_variant(sys.argv[5])
- 
- service.SetProperty("IPv4.Configuration", ipv4_configuration)
- print "New IPv4.Configuration: ", ipv4_configuration
--- 
-1.7.9.5
-
diff --git a/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch b/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
deleted file mode 100644
index 773127b..0000000
--- a/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2885e71c9c0df7ea9866e91ab79d255eaa8de53d Mon Sep 17 00:00:00 2001
-From: Daniel Wagner <daniel.wagner@bmw-carit.de>
-Date: Mon, 19 Mar 2012 14:03:28 +0100
-Subject: [PATCH 2/3] set-ipv6-method: The arguments have to be wrapped into a
- variant
-
-Fixes BMC#24986
-
-Upstream-Status: Backport
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
----
- test/set-ipv6-method |   13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/test/set-ipv6-method b/test/set-ipv6-method
-index 7f60b88..4f2de09 100755
---- a/test/set-ipv6-method
-+++ b/test/set-ipv6-method
-@@ -3,6 +3,9 @@
- import sys
- import dbus
- 
-+def make_variant(string):
-+	return dbus.String(string, variant_level=1)
-+
- def print_usage():
- 	print "Usage: %s <service> off|manual|auto [<address> [prefixlen] [gateway]] [<privacy>]" % (sys.argv[0])
- 
-@@ -19,17 +22,17 @@ properties = service.GetProperties()
- 
- print "Setting method %s for %s" % (sys.argv[2], sys.argv[1])
- 
--ipv6_configuration = { "Method": sys.argv[2] }
-+ipv6_configuration = { "Method": make_variant(sys.argv[2])}
- if sys.argv[2] == "auto":
- 	if (len(sys.argv) > 3):
--		ipv6_configuration["Privacy"] = sys.argv[3]
-+		ipv6_configuration["Privacy"] = make_variant(sys.argv[3])
- else:
- 	if (len(sys.argv) > 3):
--		ipv6_configuration["Address"] = sys.argv[3]
-+		ipv6_configuration["Address"] = make_variant(sys.argv[3])
- 	if (len(sys.argv) > 4):
--		ipv6_configuration["PrefixLength"] = sys.argv[4]
-+		ipv6_configuration["PrefixLength"] = make_variant(sys.argv[4])
- 	if (len(sys.argv) > 5):
--		ipv6_configuration["Gateway"] = sys.argv[5]
-+		ipv6_configuration["Gateway"] = make_variant(sys.argv[5])
- 
- service.SetProperty("IPv6.Configuration", ipv6_configuration)
- print "New IPv6.Configuration: ", ipv6_configuration
--- 
-1.7.9.5
-
diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb
deleted file mode 100644
index d7f22b9..0000000
--- a/meta/recipes-connectivity/connman/connman_0.79.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require connman.inc
-
-# 0.79 tag
-SRCREV = "442b1fe603e005814f592a3dbcf0d0bfb13f961c"
-SRC_URI  = "git://git.kernel.org/pub/scm/network/connman/connman.git \
-            file://add_xuser_dbus_permission.patch \
-            file://ethernet_default.patch \
-            file://disable_alg-test.patch \
-            file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
-            file://test-set-ipv4-method-api-fix.patch \
-            file://test-set-ipv6-method-api-fix.patch \
-            file://connman"
-S = "${WORKDIR}/git"
-PR = "r4"
diff --git a/meta/recipes-connectivity/connman/connman_1.0.bb b/meta/recipes-connectivity/connman/connman_1.0.bb
new file mode 100644
index 0000000..a85a77e
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman_1.0.bb
@@ -0,0 +1,9 @@
+require connman.inc
+
+# 0.94 tag
+SRCREV = "6d6f312fb2b751b4cf7037f2a526c7785364732f"
+SRC_URI  = "git://git.kernel.org/pub/scm/network/connman/connman.git \
+            file://add_xuser_dbus_permission.patch \
+            file://connman"
+S = "${WORKDIR}/git"
+PR = "r1"
-- 
1.7.7.6

Re: [PATCH 0/4] Upgrade connman to 1.0

[Koen Kooi]

Op 29 mei 2012, om 22:43 heeft Ross Burton het volgende geschreven:

> Below is a patch set upgrading connman to 1.0, and cleaning up the packaging somewhat.
> 
> It Works For Me, but my current available hardware is limited to qemux86 and
> a headless Atom machine.  In particular the non-root-X permission changes
> look to be correct (where they were previously obviously wrong) but I
> haven't verified that they work. 

IIRC the sed was done to get around the 'atconsole' restriction, is that not needed anymore? E.g. can I ssh in as root and run the connman tests and when I log in to gdm as a simple user will connman-gnome work?

regards,

Koen

Re: [PATCH 0/4] Upgrade connman to 1.0

[Burton, Ross]

On 29 May 2012 21:56, Koen Kooi <koen@dominion.thruhere.net> wrote:
> IIRC the sed was done to get around the 'atconsole' restriction, is that not needed anymore? E.g. can I ssh in as root and run the connman tests and when I log in to gdm as a simple user will connman-gnome work?

If that was the intention then it's a very heavy-handed solution...

Out of the box, root can access the service.  There is another patch
to add "xuser" for systems which run a raw X session as that user.  If
you're logging in with gdm to an arbitrary user, then the at_console
test should work, right?

(one of my plans is to remove hacks like this and have a lightweight
way of starting an X session as a normal user and actually registering
it as a session)

Ross

Re: [PATCH 4/4] connman: upgrade to 1.0

[Otavio Salvador]

[-- Attachment #1: Type: text/plain, Size: 553 bytes --]

On Tue, May 29, 2012 at 5:43 PM, Ross Burton <ross.burton@intel.com> wrote:

>  .../connman/connman/disable_alg-test.patch         |   46 ----------------
>

This will make the build fail with old kernels.


>  .../connman/connman/ethernet_default.patch         |   22 --------
>

Did you check the network is started by default?

Regards,

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

[-- Attachment #2: Type: text/html, Size: 1186 bytes --]

Re: [PATCH 0/4] Upgrade connman to 1.0

[Koen Kooi]

Op 29 mei 2012, om 23:05 heeft Burton, Ross het volgende geschreven:

> On 29 May 2012 21:56, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> IIRC the sed was done to get around the 'atconsole' restriction, is that not needed anymore? E.g. can I ssh in as root and run the connman tests and when I log in to gdm as a simple user will connman-gnome work?
> 
> If that was the intention then it's a very heavy-handed solution...
> 
> Out of the box, root can access the service.  There is another patch
> to add "xuser" for systems which run a raw X session as that user.  If
> you're logging in with gdm to an arbitrary user, then the at_console
> test should work, right?

No, our PAM magic is still not strong enough :( And worse, serial console doesn't work with at_console either.

Re: [PATCH 4/4] connman: upgrade to 1.0

[Burton, Ross]

On 29 May 2012 22:08, Otavio Salvador <otavio@ossystems.com.br> wrote:
> On Tue, May 29, 2012 at 5:43 PM, Ross Burton <ross.burton@intel.com> wrote:
>>
>>  .../connman/connman/disable_alg-test.patch         |   46
>> ----------------
>
>
> This will make the build fail with old kernels.

commit d9724d24b091a9412992cc6883ca6a225fa1a88c
Author: Marcel Holtmann <marcel@holtmann.org>
Date:   Sat Apr 21 22:04:29 2012 +0200

    build: Remove useless alg-test example program

>>  .../connman/connman/ethernet_default.patch         |   22 --------
>
>
> Did you check the network is started by default?

commit 091347cc83aa28a2395630274b6f1334fcab4f88
Author: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Date:   Fri Apr 27 16:01:48 2012 +0300

    technology: Enable ethernet by default

As I said, irrelevant patches were dropped.

Ross

Re: [PATCH 0/4] Upgrade connman to 1.0

[Burton, Ross]

On 29 May 2012 22:20, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> Out of the box, root can access the service.  There is another patch
>> to add "xuser" for systems which run a raw X session as that user.  If
>> you're logging in with gdm to an arbitrary user, then the at_console
>> test should work, right?
>
> No, our PAM magic is still not strong enough :( And worse, serial console doesn't work with at_console either.

Damn shame - totally bust access control is quite depressing.  I'll
revert that chunk and throw a large comment around it - can't have
something some suspicious without any documentation.

Hopefully without sounding like an ex-MeeGo fanboy, uxlaunch is
actually pretty useful for this.  It sets up a proper PAM login,
brings up X, and handles XDG autostart.  Might be worth looking at for
single-user environments.

Ross

Re: [PATCH 1/4] connman: just give xuser the extra rights it needs

[Khem Raj]

On Tue, May 29, 2012 at 1:43 PM, Ross Burton <ross.burton@intel.com> wrote:
>
>
> -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> +Signed-off-by: Ross Burton <ross.burton@intel.com>

why remove the old sign-off ?

Re: [PATCH 0/4] Upgrade connman to 1.0

[Iorga, Cristian]

Hi Ross,

As far as I have seen from the code, between the previous version of connman and version 1.0, the way the default connection is set has changed.

Right now, the default connection is established through an external file.
Before 1.0, the default connection was established via the code (and a patch was added in the recipe against this, and it needs to be adapted).

See bug regarding this:
Bug #2491
https://bugzilla.yoctoproject.org/show_bug.cgi?id=2491


-----Original Message-----
From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Burton, Ross
Sent: Wednesday, May 30, 2012 6:13 AM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 0/4] Upgrade connman to 1.0

On 29 May 2012 22:20, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> Out of the box, root can access the service.  There is another patch 
>> to add "xuser" for systems which run a raw X session as that user.  
>> If you're logging in with gdm to an arbitrary user, then the 
>> at_console test should work, right?
>
> No, our PAM magic is still not strong enough :( And worse, serial console doesn't work with at_console either.

Damn shame - totally bust access control is quite depressing.  I'll revert that chunk and throw a large comment around it - can't have something some suspicious without any documentation.

Hopefully without sounding like an ex-MeeGo fanboy, uxlaunch is actually pretty useful for this.  It sets up a proper PAM login, brings up X, and handles XDG autostart.  Might be worth looking at for single-user environments.

Ross

_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 1/4] connman: just give xuser the extra rights it needs

[Burton, Ross]

On 30 May 2012 03:59, Khem Raj <raj.khem@gmail.com> wrote:
> On Tue, May 29, 2012 at 1:43 PM, Ross Burton <ross.burton@intel.com> wrote:
>>
>>
>> -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
>> +Signed-off-by: Ross Burton <ross.burton@intel.com>
>
> why remove the old sign-off ?

The patches are semantically different - Dongxiao's solution was to
copy the root rules, my solution is to copy the at_console rules.  He
didn't sign off my solution, so I removed his sign-off.

Ross

Re: [PATCH 0/4] Upgrade connman to 1.0

[Burton, Ross]

On 30 May 2012 04:53, Iorga, Cristian <cristian.iorga@intel.com> wrote:
> Hi Ross,
>
> As far as I have seen from the code, between the previous version of connman and version 1.0, the way the default connection is set has changed.
>
> Right now, the default connection is established through an external file.
> Before 1.0, the default connection was established via the code (and a patch was added in the recipe against this, and it needs to be adapted).

With 1.0, if there is no global configuration the technology is
enabled if ethernet, otherwise disabled.

Ross

Re: [PATCH 1/4] connman: just give xuser the extra rights it needs

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 943 bytes --]

On Wednesday, May 30, 2012, Burton, Ross wrote:

> On 30 May 2012 03:59, Khem Raj <raj.khem@gmail.com <javascript:;>> wrote:
> > On Tue, May 29, 2012 at 1:43 PM, Ross Burton <ross.burton@intel.com<javascript:;>>
> wrote:
> >>
> >>
> >> -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com <javascript:;>>
> >> +Signed-off-by: Ross Burton <ross.burton@intel.com <javascript:;>>
> >
> > why remove the old sign-off ?
>
> The patches are semantically different - Dongxiao's solution was to
> copy the root rules, my solution is to copy the at_console rules.  He
> didn't sign off my solution, so I removed his sign-off.
>
> You could have created a new patch and deleted the old then for clarity


> Ross
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org <javascript:;>
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 1840 bytes --]

Re: [PATCH 1/4] connman: just give xuser the extra rights it needs

[Burton, Ross]

On 30 May 2012 14:00, Khem Raj <raj.khem@gmail.com> wrote:
> You could have created a new patch and deleted the old then for clarity

The filename is sensible, the comment was entirely rewritten, as was
the actual delta of the patch.  I don't see how this could be any more
clear really.

Ross

Re: [PATCH 1/4] connman: just give xuser the extra rights it needs

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 721 bytes --]

On Wednesday, May 30, 2012, Burton, Ross wrote:

> On 30 May 2012 14:00, Khem Raj <raj.khem@gmail.com <javascript:;>> wrote:
> > You could have created a new patch and deleted the old then for clarity
>
> The filename is sensible, the comment was entirely rewritten, as was
> the actual delta of the patch.  I don't see how this could be any more
> clear really.
>
>
Not an issue. usually editing same patch gives the impression of update not
rewrite
But you explained it


> Ross
>
> _______________________________________________
> Openembedded-core mailing lists
> Openembedded-core@lists.openembedded.org <javascript:;>
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 1337 bytes --]

Re: [PATCH 1/4] connman: just give xuser the extra rights it needs

[Flanagan, Elizabeth]

On Tue, May 29, 2012 at 1:43 PM, Ross Burton <ross.burton@intel.com> wrote:
> ---
>  .../connman/add_xuser_dbus_permission.patch        |   14 +++++---------
>  1 files changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
> index aa7a910..707b3ca 100644
> --- a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
> +++ b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
> @@ -1,24 +1,20 @@
> -Some platform (like atom-pc) enables rootless X,
> -thus we need to add the xuser in the list.
> +Because Poky doesn't support at_console we need to special-case the session
> +user.
>
>  Upstream-Status: Inappropriate [configuration]
>
> -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> +Signed-off-by: Ross Burton <ross.burton@intel.com>
>
>  diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf
> -index 98a773e..cbe2ba3 100644
> +index 98a773e..466809c 100644
>  --- a/src/connman-dbus.conf
>  +++ b/src/connman-dbus.conf
> -@@ -8,6 +8,13 @@
> +@@ -8,6 +8,9 @@
>          <allow send_interface="net.connman.Counter"/>
>          <allow send_interface="net.connman.Notification"/>
>      </policy>
>  +    <policy user="xuser">
> -+        <allow own="net.connman"/>
>  +        <allow send_destination="net.connman"/>
> -+        <allow send_interface="net.connman.Agent"/>
> -+        <allow send_interface="net.connman.Counter"/>
> -+        <allow send_interface="net.connman.Notification"/>
>  +    </policy>
>      <policy at_console="true">
>          <allow send_destination="net.connman"/>
> --
> 1.7.7.6
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core

Thanks

-b

-- 
Elizabeth Flanagan
Yocto Project
Build and Release