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

Proposed by Kalle Valo on 2011-03-16
Status: Merged
Merged at revision: 27
Proposed branch: lp:~kvalo/connman/bug-734339
Merge into: lp:ubuntu/natty/connman
Diff against target: 165 lines (+56/-11)
5 files modified
debian/changelog (+13/-0)
debian/patches/04-wifi-add-a-disconnected-timer.patch (+12/-9)
debian/patches/11-dnsproxy-do-not-add-null-domains.patch (+29/-0)
debian/patches/series (+1/-0)
debian/rules (+1/-2)
To merge this branch: bzr merge lp:~kvalo/connman/bug-734339
Reviewer Review Type Date Requested Status
Andres Rodriguez 2011-03-16 Approve on 2011-03-16
Review via email: mp+53611@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

Everything looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-16 05:43:52 +0000
3+++ debian/changelog 2011-03-16 12:03:25 +0000
4@@ -1,3 +1,16 @@
5+connman (0.69-0ubuntu2) natty; urgency=low
6+
7+ * debian/rules: Remove unsupported configured switches --enable-dhclient
8+ and --enable-udev.
9+ * 11-dnsproxy-do-not-add-null-domains.patch: add to fix a crash with
10+ domain handling. (LP: #734339)
11+ * 04-wifi-add-a-disconnected-timer.patch: fix for a case if network is
12+ null. (LP: #733458)
13+ * debian/rules: enable nmcompat plugin so that applications can receive
14+ network state signals. (LP: #586033)
15+
16+ -- Kalle Valo <kalle.valo@canonical.com> Wed, 16 Mar 2011 10:53:33 +0200
17+
18 connman (0.69-0ubuntu1) natty; urgency=low
19
20 * New upstream release.
21
22=== modified file 'debian/patches/04-wifi-add-a-disconnected-timer.patch'
23--- debian/patches/04-wifi-add-a-disconnected-timer.patch 2011-02-10 20:29:04 +0000
24+++ debian/patches/04-wifi-add-a-disconnected-timer.patch 2011-03-16 12:03:25 +0000
25@@ -22,10 +22,10 @@
26 plugins/wifi.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
27 1 files changed, 61 insertions(+), 3 deletions(-)
28
29-Index: head.packaging/plugins/wifi.c
30+Index: bug-734339/plugins/wifi.c
31 ===================================================================
32---- head.packaging.orig/plugins/wifi.c 2011-02-08 17:05:22.000000000 +0200
33-+++ head.packaging/plugins/wifi.c 2011-02-08 17:06:55.000000000 +0200
34+--- bug-734339.orig/plugins/wifi.c 2011-03-15 07:09:03.000000000 +0000
35++++ bug-734339/plugins/wifi.c 2011-03-15 07:09:51.000000000 +0000
36 @@ -69,10 +69,13 @@
37 int index;
38 unsigned flags;
39@@ -40,7 +40,7 @@
40 static int get_bssid(struct connman_device *device,
41 unsigned char *bssid, unsigned int *bssid_len)
42 {
43-@@ -489,6 +492,8 @@
44+@@ -479,6 +482,8 @@
45
46 connman_network_set_associating(network, FALSE);
47
48@@ -49,7 +49,7 @@
49 if (wifi->disconnecting == TRUE)
50 return -EALREADY;
51
52-@@ -654,6 +659,73 @@
53+@@ -644,6 +649,76 @@
54 return "UNKNOWN";
55 }
56
57@@ -71,6 +71,9 @@
58 +
59 + network = wifi->network;
60 +
61++ if (network == NULL)
62++ return FALSE;
63++
64 + /*
65 + * If we're in one of the idle modes, we have
66 + * not started association yet and thus setting
67@@ -123,7 +126,7 @@
68 static void interface_state(GSupplicantInterface *interface)
69 {
70 struct connman_network *network;
71-@@ -662,7 +734,6 @@
72+@@ -652,7 +727,6 @@
73 GSupplicantState state = g_supplicant_interface_get_state(interface);
74 unsigned char bssid[ETH_ALEN];
75 unsigned int bssid_len;
76@@ -131,7 +134,7 @@
77
78 wifi = g_supplicant_interface_get_data(interface);
79
80-@@ -674,8 +745,10 @@
81+@@ -664,8 +738,10 @@
82 network = wifi->network;
83 device = wifi->device;
84
85@@ -143,7 +146,7 @@
86
87 switch (state) {
88 case G_SUPPLICANT_STATE_SCANNING:
89-@@ -694,6 +767,8 @@
90+@@ -684,6 +760,8 @@
91 /* reset scan trigger and schedule background scan */
92 connman_device_schedule_scan(device);
93
94@@ -152,7 +155,7 @@
95 if (get_bssid(device, bssid, &bssid_len) == 0)
96 connman_network_set_address(network,
97 bssid, bssid_len);
98-@@ -701,21 +776,7 @@
99+@@ -691,21 +769,7 @@
100 break;
101
102 case G_SUPPLICANT_STATE_DISCONNECTED:
103
104=== added file 'debian/patches/11-dnsproxy-do-not-add-null-domains.patch'
105--- debian/patches/11-dnsproxy-do-not-add-null-domains.patch 1970-01-01 00:00:00 +0000
106+++ debian/patches/11-dnsproxy-do-not-add-null-domains.patch 2011-03-16 12:03:25 +0000
107@@ -0,0 +1,29 @@
108+From: Samuel Ortiz <sameo@linux.intel.com>
109+Date: Tue, 8 Feb 2011 00:56:04 +0100
110+Subject: [PATCH] dnsproxy: Do not add NULL domains to the domain list
111+Origin: http://git.kernel.org/?p=network/connman/connman.git;a=commit;h=29873834009a4e88efc151104dfac3975ddeba81
112+Bug-Ubuntu: https://bugs.launchpad.net/connman/+bug/734339
113+Last-Update: 2011-03-15
114+
115+
116+---
117+ src/dnsproxy.c | 3 +++
118+ 1 files changed, 3 insertions(+), 0 deletions(-)
119+
120+diff --git a/src/dnsproxy.c b/src/dnsproxy.c
121+index b7667a6..201c365 100644
122+--- a/src/dnsproxy.c
123++++ b/src/dnsproxy.c
124+@@ -836,6 +836,9 @@ static void append_domain(const char *interface, const char *domain)
125+
126+ DBG("interface %s domain %s", interface, domain);
127+
128++ if (domain == NULL)
129++ return;
130++
131+ for (list = server_list; list; list = list->next) {
132+ struct server_data *data = list->data;
133+ GList *dom_list;
134+--
135+1.7.4.1
136+
137
138=== modified file 'debian/patches/series'
139--- debian/patches/series 2011-02-10 22:05:21 +0000
140+++ debian/patches/series 2011-03-16 12:03:25 +0000
141@@ -5,3 +5,4 @@
142 05-wifi-don-t-set-associating-sta.patch
143 08-remove-internal-backtrace-hand.patch
144 10-fix-dhcp-renewal-disconnect.patch
145+11-dnsproxy-do-not-add-null-domains.patch
146
147=== modified file 'debian/rules'
148--- debian/rules 2011-02-10 20:12:35 +0000
149+++ debian/rules 2011-03-16 12:03:25 +0000
150@@ -16,14 +16,13 @@
151 DEB_DESTDIR = $(CURDIR)/debian/tmp/
152
153 DEB_CONFIGURE_EXTRA_FLAGS += \
154- --enable-dhclient=builtin \
155 --enable-ethernet=builtin \
156 --enable-loopback=builtin \
157 --enable-pie \
158 --enable-wifi=builtin \
159 --enable-ofono=builtin \
160 --enable-bluetooth=builtin \
161- --enable-udev \
162+ --enable-nmcompat=builtin \
163 --disable-polkit \
164 --enable-client \
165 $(NULL)

Subscribers

People subscribed via source and target branches

to all changes: