Merge lp:~kvalo/connman/bug-734339 into lp:ubuntu/natty/connman

[Kalle Valo]

connman (0.69-0ubuntu2) natty; urgency=low

  * debian/rules: Remove unsupported configured switches --enable-dhclient
    and --enable-udev.
  * 11-dnsproxy-do-not-add-null-domains.patch: add to fix a crash with
    domain handling. (LP: #734339)
  * 04-wifi-add-a-disconnected-timer.patch: fix for a case if network is
    null. (LP: #733458)
  * debian/rules: enable nmcompat plugin so that applications can receive
    network state signals. (LP: #586033)

 -- Kalle Valo <email address hidden> Wed, 16 Mar 2011 10:53:33 +0200

[Andres Rodriguez (andreserl)]

Everything looks good!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-16 05:43:52 +0000
+++ debian/changelog	2011-03-16 12:03:25 +0000
@@ -1,3 +1,16 @@
+connman (0.69-0ubuntu2) natty; urgency=low
+
+  * debian/rules: Remove unsupported configured switches --enable-dhclient
+    and --enable-udev.
+  * 11-dnsproxy-do-not-add-null-domains.patch: add to fix a crash with
+    domain handling. (LP: #734339)
+  * 04-wifi-add-a-disconnected-timer.patch: fix for a case if network is
+    null. (LP: #733458)
+  * debian/rules: enable nmcompat plugin so that applications can receive
+    network state signals. (LP: #586033)
+
+ -- Kalle Valo <[e-mail]>  Wed, 16 Mar 2011 10:53:33 +0200
+
 connman (0.69-0ubuntu1) natty; urgency=low
 
   * New upstream release.

=== modified file 'debian/patches/04-wifi-add-a-disconnected-timer.patch'
--- debian/patches/04-wifi-add-a-disconnected-timer.patch	2011-02-10 20:29:04 +0000
+++ debian/patches/04-wifi-add-a-disconnected-timer.patch	2011-03-16 12:03:25 +0000
@@ -22,10 +22,10 @@
  plugins/wifi.c |   64 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
  1 files changed, 61 insertions(+), 3 deletions(-)
 
-Index: head.packaging/plugins/wifi.c
+Index: bug-734339/plugins/wifi.c
 ===================================================================
---- head.packaging.orig/plugins/wifi.c	2011-02-08 17:05:22.000000000 +0200
-+++ head.packaging/plugins/wifi.c	2011-02-08 17:06:55.000000000 +0200
+--- bug-734339.orig/plugins/wifi.c	2011-03-15 07:09:03.000000000 +0000
++++ bug-734339/plugins/wifi.c	2011-03-15 07:09:51.000000000 +0000
 @@ -69,10 +69,13 @@
  	int index;
  	unsigned flags;
@@ -40,7 +40,7 @@
  static int get_bssid(struct connman_device *device,
  				unsigned char *bssid, unsigned int *bssid_len)
  {
-@@ -489,6 +492,8 @@
+@@ -479,6 +482,8 @@
  
  	connman_network_set_associating(network, FALSE);
  
@@ -49,7 +49,7 @@
  	if (wifi->disconnecting == TRUE)
  		return -EALREADY;
  
-@@ -654,6 +659,73 @@
+@@ -644,6 +649,76 @@
  	return "UNKNOWN";
  }
  
@@ -71,6 +71,9 @@
 +
 +	network = wifi->network;
 +
++	if (network == NULL)
++		return FALSE;
++
 +	/*
 +	 * If we're in one of the idle modes, we have
 +	 * not started association yet and thus setting
@@ -123,7 +126,7 @@
  static void interface_state(GSupplicantInterface *interface)
  {
  	struct connman_network *network;
-@@ -662,7 +734,6 @@
+@@ -652,7 +727,6 @@
  	GSupplicantState state = g_supplicant_interface_get_state(interface);
  	unsigned char bssid[ETH_ALEN];
  	unsigned int bssid_len;
@@ -131,7 +134,7 @@
  
  	wifi = g_supplicant_interface_get_data(interface);
  
-@@ -674,8 +745,10 @@
+@@ -664,8 +738,10 @@
  	network = wifi->network;
  	device = wifi->device;
  
@@ -143,7 +146,7 @@
  
  	switch (state) {
  	case G_SUPPLICANT_STATE_SCANNING:
-@@ -694,6 +767,8 @@
+@@ -684,6 +760,8 @@
  		/* reset scan trigger and schedule background scan */
  		connman_device_schedule_scan(device);
  
@@ -152,7 +155,7 @@
  		if (get_bssid(device, bssid, &bssid_len) == 0)
  			connman_network_set_address(network,
  							bssid, bssid_len);
-@@ -701,21 +776,7 @@
+@@ -691,21 +769,7 @@
  		break;
  
  	case G_SUPPLICANT_STATE_DISCONNECTED:

=== added file 'debian/patches/11-dnsproxy-do-not-add-null-domains.patch'
--- debian/patches/11-dnsproxy-do-not-add-null-domains.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/11-dnsproxy-do-not-add-null-domains.patch	2011-03-16 12:03:25 +0000
@@ -0,0 +1,29 @@
+From: Samuel Ortiz <[e-mail]>
+Date: Tue, 8 Feb 2011 00:56:04 +0100
+Subject: [PATCH] dnsproxy: Do not add NULL domains to the domain list
+Origin: http://git.kernel.org/?p=network/connman/connman.git;a=commit;h=29873834009a4e88efc151104dfac3975ddeba81
+Bug-Ubuntu: https://bugs.launchpad.net/connman/+bug/734339
+Last-Update: 2011-03-15
+
+
+---
+ src/dnsproxy.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/dnsproxy.c b/src/dnsproxy.c
+index b7667a6..201c365 100644
+--- a/src/dnsproxy.c
++++ b/src/dnsproxy.c
+@@ -836,6 +836,9 @@ static void append_domain(const char *interface, const char *domain)
+ 
+ 	DBG("interface %s domain %s", interface, domain);
+ 
++	if (domain == NULL)
++		return;
++
+ 	for (list = server_list; list; list = list->next) {
+ 		struct server_data *data = list->data;
+ 		GList *dom_list;
+-- 
+1.7.4.1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-10 22:05:21 +0000
+++ debian/patches/series	2011-03-16 12:03:25 +0000
@@ -5,3 +5,4 @@
 05-wifi-don-t-set-associating-sta.patch
 08-remove-internal-backtrace-hand.patch
 10-fix-dhcp-renewal-disconnect.patch
+11-dnsproxy-do-not-add-null-domains.patch

=== modified file 'debian/rules'
--- debian/rules	2011-02-10 20:12:35 +0000
+++ debian/rules	2011-03-16 12:03:25 +0000
@@ -16,14 +16,13 @@
 DEB_DESTDIR = $(CURDIR)/debian/tmp/
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
-		--enable-dhclient=builtin \
 		--enable-ethernet=builtin \
 		--enable-loopback=builtin \
 		--enable-pie \
 		--enable-wifi=builtin \
 		--enable-ofono=builtin \
 		--enable-bluetooth=builtin \
-		--enable-udev \
+		--enable-nmcompat=builtin \
 		--disable-polkit \
 		--enable-client \
                 $(NULL)