Merge lp:~awe/network-manager/update-1.2-touch into lp:~phablet-team/network-manager/touch-1.2
- update-1.2-touch
- Merge into touch-1.2
Proposed by
Tony Espy
Status: | Merged |
---|---|
Merged at revision: | 1036 |
Proposed branch: | lp:~awe/network-manager/update-1.2-touch |
Merge into: | lp:~phablet-team/network-manager/touch-1.2 |
Diff against target: |
944 lines (+337/-207) 15 files modified
debian/changelog (+34/-6) debian/control (+1/-1) debian/indicator-network.pkla (+6/-0) debian/libnm-dev.install (+2/-1) debian/network-manager.install (+1/-2) debian/network-manager.upstart (+24/-0) debian/patches/clear-requested-scan-when-supplicant-goes-down.patch (+31/-0) debian/patches/dbus-conf-add-sudo-for-indicator-network.patch (+30/-0) debian/patches/ignore_rild_modem_devices.patch (+15/-13) debian/patches/lp1099983_ignore-p2p-wifi-devices.patch (+18/-17) debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch (+52/-50) debian/patches/series (+4/-1) debian/patches/wifi-wpas-inactive.patch (+30/-0) debian/patches/wwan-add-ofono-modem-support.patch (+67/-105) debian/rules (+22/-11) |
To merge this branch: | bzr merge lp:~awe/network-manager/update-1.2-touch |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phablet Team | Pending | ||
Review via email: mp+292570@code.launchpad.net |
Commit message
Description of the change
This merge proposal backports the recent desktop/xenial landing of NM 1.2 to vivid for use on Touch.
Differences include:
* bluez5 explicitly disabled ( DUN ! supported on Touch yet )
* ppp disabled ( 2.4.7 needs to be backported )
* systemd logging disabled
* updates to ignore_device patches ( rild & p2p )
* updates to wwan plugin NMModemOfono and NMModemManager classes
To post a comment you must log in.
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 2016-04-07 21:09:58 +0000 | |||
3 | +++ debian/changelog 2016-04-27 16:19:01 +0000 | |||
4 | @@ -1,4 +1,4 @@ | |||
6 | 1 | network-manager (1.1.93-0ubuntu1) UNRELEASED; urgency=medium | 1 | network-manager (1.1.93-0ubuntu1~vivid1) vivid; urgency=medium |
7 | 2 | 2 | ||
8 | 3 | * New upstream release. | 3 | * New upstream release. |
9 | 4 | * Resynchronize with Debian; remaining changes: | 4 | * Resynchronize with Debian; remaining changes: |
10 | @@ -58,17 +58,45 @@ | |||
11 | 58 | * Renamed 0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch | 58 | * Renamed 0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch |
12 | 59 | to wwan-add-ofono-modem-support.patch as this patch needed to be | 59 | to wwan-add-ofono-modem-support.patch as this patch needed to be |
13 | 60 | extensively re-worked due to dbus-glib being deprecated in NM1.2. | 60 | extensively re-worked due to dbus-glib being deprecated in NM1.2. |
15 | 61 | * Remove upstreamed patches: | 61 | * Removed upstreamed patches: |
16 | 62 | - tests-fix-bashism-in-run-test-dbus-session.sh.patch | 62 | - tests-fix-bashism-in-run-test-dbus-session.sh.patch |
17 | 63 | - wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch | 63 | - wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch |
18 | 64 | - lp1496434_warn_on_invalid_new_link.patch: alternate fix landed | 64 | - lp1496434_warn_on_invalid_new_link.patch: alternate fix landed |
19 | 65 | upstream which ensures that a valid error instance is returned | 65 | upstream which ensures that a valid error instance is returned |
20 | 66 | by the factory_create_link method. | 66 | by the factory_create_link method. |
24 | 67 | * Update all symbols files. | 67 | * Updated all symbols files. |
25 | 68 | * Rename ignore_rmnet_devices.path to ignore_rild_modem_devices.patch | 68 | * Renamed ignore_rmnet_devices.path to ignore_rild_modem_devices.patch |
26 | 69 | * Restore wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch | 69 | * Restored wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch |
27 | 70 | * Restored lp1461593-add-modem-reconnect-delay-to-policy.patch | ||
28 | 71 | * Updated d/control: temporarily remove ppp-dev till 2.4.7 backported. | ||
29 | 72 | * Updated d/rules: | ||
30 | 73 | - Temporarily disable gir, and ppp. | ||
31 | 74 | - Disable systemd-journal to restore syslog support. | ||
32 | 75 | - Fix dh_strip for vivid. | ||
33 | 76 | - Disable bluez5_dun support ( not supported on Touch yet ). | ||
34 | 77 | * Restored d/network-manager.upstart. | ||
35 | 78 | * Updated d/network-manager.install: disable install of pppd/*. | ||
36 | 79 | * Updated d/libnm-dev.install: disable install of gir/*. | ||
37 | 80 | * Added d/p/dbus-conf-add-sudo-for-indicator-network.patch: this patch | ||
38 | 81 | adds a 'sudo' policy group to allow indicator-network to use the | ||
39 | 82 | NetworkManager and NetworkManager.SecretAgent DBus interfaces. | ||
40 | 83 | * Added d/indicator-network.pkla, d/rules: install policy kit conf | ||
41 | 84 | file; this replaces a dirty hack in livecd-rootfs which created | ||
42 | 85 | this file on behalf of indicator-network. | ||
43 | 86 | * Updated d/p/wwan-add-ofono-modem-support.patch: fix MM and ofono | ||
44 | 87 | bus detection and MM restart logic so that NM doesn't keep trying | ||
45 | 88 | to start MM if it's not installed. | ||
46 | 89 | * Updated d/p/ignore_rild_modem_devices.patch: add 'rev_rmnet' (mako) | ||
47 | 90 | to list; also move filter logic before device creation. | ||
48 | 91 | * Updated d/p/lp1099983_ignore-p2p-wifi-devices.patch: move filter | ||
49 | 92 | logic before device creation. | ||
50 | 93 | * d/rules: add explicit --disable-bluez5 to configure. | ||
51 | 94 | * Added d/p/wifi-wpas-inactive.patch: handle wpa_supplicant | ||
52 | 95 | WiFi stall related to INACTIVE state. | ||
53 | 96 | * Added d/p/clear-requested-scan-when-supplicant-goes-down.patch: | ||
54 | 97 | Clear scan_requested flag if supplicant released. | ||
55 | 70 | 98 | ||
57 | 71 | -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 03 Mar 2016 15:51:48 -0500 | 99 | -- Tony Espy <espy@canonical.com> Wed, 27 Apr 2016 12:17:48 -0500 |
58 | 72 | 100 | ||
59 | 73 | network-manager (1.0.4-0ubuntu10) xenial; urgency=medium | 101 | network-manager (1.0.4-0ubuntu10) xenial; urgency=medium |
60 | 74 | 102 | ||
61 | 75 | 103 | ||
62 | === modified file 'debian/control' | |||
63 | --- debian/control 2016-03-15 21:52:04 +0000 | |||
64 | +++ debian/control 2016-04-27 16:19:01 +0000 | |||
65 | @@ -16,7 +16,7 @@ | |||
66 | 16 | libnl-3-dev (>= 3.2.8), | 16 | libnl-3-dev (>= 3.2.8), |
67 | 17 | libnl-route-3-dev (>= 3.2.8), | 17 | libnl-route-3-dev (>= 3.2.8), |
68 | 18 | libnl-genl-3-dev (>= 3.2.8), | 18 | libnl-genl-3-dev (>= 3.2.8), |
70 | 19 | ppp-dev (>= 2.4.7-1+1), | 19 | ppp-dev (>= 2.4.6), |
71 | 20 | libpolkit-gobject-1-dev, | 20 | libpolkit-gobject-1-dev, |
72 | 21 | libpolkit-agent-1-dev (>= 0.97), | 21 | libpolkit-agent-1-dev (>= 0.97), |
73 | 22 | libgnutls-dev, | 22 | libgnutls-dev, |
74 | 23 | 23 | ||
75 | === added file 'debian/indicator-network.pkla' | |||
76 | --- debian/indicator-network.pkla 1970-01-01 00:00:00 +0000 | |||
77 | +++ debian/indicator-network.pkla 2016-04-27 16:19:01 +0000 | |||
78 | @@ -0,0 +1,6 @@ | |||
79 | 1 | [indicator-network-service] | ||
80 | 2 | Identity=unix-group:sudo | ||
81 | 3 | Action=org.freedesktop.NetworkManager.* | ||
82 | 4 | ResultAny=yes | ||
83 | 5 | ResultInactive=no | ||
84 | 6 | ResultActive=yes | ||
85 | 0 | 7 | ||
86 | === modified file 'debian/libnm-dev.install' | |||
87 | --- debian/libnm-dev.install 2015-08-20 09:47:16 +0000 | |||
88 | +++ debian/libnm-dev.install 2016-04-27 16:19:01 +0000 | |||
89 | @@ -2,4 +2,5 @@ | |||
90 | 2 | usr/lib/*/libnm.so | 2 | usr/lib/*/libnm.so |
91 | 3 | usr/include/libnm/ | 3 | usr/include/libnm/ |
92 | 4 | usr/share/gtk-doc/html/libnm/ | 4 | usr/share/gtk-doc/html/libnm/ |
94 | 5 | usr/share/gir-1.0/NM-1.0.gir | 5 | # temporarily disabled for 1.2 landing: |
95 | 6 | #usr/share/gir-1.0/NM-1.0.gir | ||
96 | 6 | 7 | ||
97 | === modified file 'debian/network-manager.install' | |||
98 | --- debian/network-manager.install 2016-03-15 21:52:04 +0000 | |||
99 | +++ debian/network-manager.install 2016-04-27 16:19:01 +0000 | |||
100 | @@ -6,11 +6,10 @@ | |||
101 | 6 | usr/lib/NetworkManager/nm-iface-helper | 6 | usr/lib/NetworkManager/nm-iface-helper |
102 | 7 | usr/lib/NetworkManager/nm-dispatcher | 7 | usr/lib/NetworkManager/nm-dispatcher |
103 | 8 | usr/lib/*/NetworkManager/libnm-settings-plugin-ifupdown.so | 8 | usr/lib/*/NetworkManager/libnm-settings-plugin-ifupdown.so |
104 | 9 | usr/lib/*/NetworkManager/libnm-settings-plugin-ibft.so | ||
105 | 10 | usr/lib/*/NetworkManager/libnm-settings-plugin-ofono.so | 9 | usr/lib/*/NetworkManager/libnm-settings-plugin-ofono.so |
106 | 11 | usr/lib/*/NetworkManager/libnm-device-plugin-*.so | 10 | usr/lib/*/NetworkManager/libnm-device-plugin-*.so |
107 | 12 | usr/lib/*/NetworkManager/libnm-wwan.so | 11 | usr/lib/*/NetworkManager/libnm-wwan.so |
109 | 13 | usr/lib/pppd/*/*.so | 12 | #usr/lib/pppd/*/*.so |
110 | 14 | usr/share/doc/NetworkManager/examples/ | 13 | usr/share/doc/NetworkManager/examples/ |
111 | 15 | usr/share/locale/ | 14 | usr/share/locale/ |
112 | 16 | usr/share/man/ | 15 | usr/share/man/ |
113 | 17 | 16 | ||
114 | === added file 'debian/network-manager.upstart' | |||
115 | --- debian/network-manager.upstart 1970-01-01 00:00:00 +0000 | |||
116 | +++ debian/network-manager.upstart 2016-04-27 16:19:01 +0000 | |||
117 | @@ -0,0 +1,24 @@ | |||
118 | 1 | # network-manager - network connection manager | ||
119 | 2 | # | ||
120 | 3 | # The Network Manager daemon manages the system's network connections, | ||
121 | 4 | # automatically switching between the best available. | ||
122 | 5 | |||
123 | 6 | description "network connection manager" | ||
124 | 7 | |||
125 | 8 | start on (local-filesystems | ||
126 | 9 | and started dbus | ||
127 | 10 | and static-network-up) | ||
128 | 11 | stop on stopping dbus | ||
129 | 12 | |||
130 | 13 | expect fork | ||
131 | 14 | respawn | ||
132 | 15 | |||
133 | 16 | script | ||
134 | 17 | # set $LANG so that messages appearing on the GUI will be translated. See LP: 875017 | ||
135 | 18 | if [ -r /etc/default/locale ]; then | ||
136 | 19 | . /etc/default/locale | ||
137 | 20 | export LANG LANGUAGE LC_MESSAGES LC_ALL | ||
138 | 21 | fi | ||
139 | 22 | |||
140 | 23 | exec NetworkManager | ||
141 | 24 | end script | ||
142 | 0 | 25 | ||
143 | === added file 'debian/patches/clear-requested-scan-when-supplicant-goes-down.patch' | |||
144 | --- debian/patches/clear-requested-scan-when-supplicant-goes-down.patch 1970-01-01 00:00:00 +0000 | |||
145 | +++ debian/patches/clear-requested-scan-when-supplicant-goes-down.patch 2016-04-27 16:19:01 +0000 | |||
146 | @@ -0,0 +1,31 @@ | |||
147 | 1 | --- | ||
148 | 2 | src/devices/wifi/nm-device-wifi.c | 7 +++++++ | ||
149 | 3 | 1 file changed, 7 insertions(+) | ||
150 | 4 | |||
151 | 5 | Index: network-manager-1.1.93/src/devices/wifi/nm-device-wifi.c | ||
152 | 6 | =================================================================== | ||
153 | 7 | --- network-manager-1.1.93.orig/src/devices/wifi/nm-device-wifi.c | ||
154 | 8 | +++ network-manager-1.1.93/src/devices/wifi/nm-device-wifi.c | ||
155 | 9 | @@ -246,6 +246,13 @@ supplicant_interface_release (NMDeviceWi | ||
156 | 10 | |||
157 | 11 | priv = NM_DEVICE_WIFI_GET_PRIVATE (self); | ||
158 | 12 | |||
159 | 13 | + if (priv->requested_scan) { | ||
160 | 14 | + nm_log_dbg (LOGD_WIFI_SCAN, "(%s): reset requested_scan flag to FALSE", | ||
161 | 15 | + nm_device_get_iface (NM_DEVICE (self))); | ||
162 | 16 | + priv->requested_scan = FALSE; | ||
163 | 17 | + nm_device_remove_pending_action (NM_DEVICE (self), "scan", TRUE); | ||
164 | 18 | + } | ||
165 | 19 | + | ||
166 | 20 | nm_clear_g_source (&priv->pending_scan_id); | ||
167 | 21 | |||
168 | 22 | /* Reset the scan interval to be pretty frequent when disconnected */ | ||
169 | 23 | @@ -1915,7 +1922,7 @@ supplicant_iface_state_cb (NMSupplicantI | ||
170 | 24 | priv->requested_scan = FALSE; | ||
171 | 25 | } | ||
172 | 26 | |||
173 | 27 | - cancel_pending_scan (self); | ||
174 | 28 | + nm_clear_g_source (&priv->pending_scan_id); | ||
175 | 29 | request_wireless_scan (self, NULL); | ||
176 | 30 | } | ||
177 | 31 | default: | ||
178 | 0 | 32 | ||
179 | === added file 'debian/patches/dbus-conf-add-sudo-for-indicator-network.patch' | |||
180 | --- debian/patches/dbus-conf-add-sudo-for-indicator-network.patch 1970-01-01 00:00:00 +0000 | |||
181 | +++ debian/patches/dbus-conf-add-sudo-for-indicator-network.patch 2016-04-27 16:19:01 +0000 | |||
182 | @@ -0,0 +1,30 @@ | |||
183 | 1 | Author: Tony Espy <espy@canonical.com> | ||
184 | 2 | Subject: Add sudo policy to DBus conf for indicator-network | ||
185 | 3 | |||
186 | 4 | This patch adds a 'sudo' group DBus policy to allow | ||
187 | 5 | indicator-network to interact with the NetworkManager and | ||
188 | 6 | NetworkManager.SecretAgent interfaces. | ||
189 | 7 | |||
190 | 8 | This was previously handled by a dirty hack/hook in the | ||
191 | 9 | livecd-rootfs tool used to build touch images. | ||
192 | 10 | |||
193 | 11 | --- | ||
194 | 12 | src/org.freedesktop.NetworkManager.conf | 5 +++++ | ||
195 | 13 | 1 file changed, 5 insertions(+) | ||
196 | 14 | |||
197 | 15 | Index: b/src/org.freedesktop.NetworkManager.conf | ||
198 | 16 | =================================================================== | ||
199 | 17 | --- a/src/org.freedesktop.NetworkManager.conf | ||
200 | 18 | +++ b/src/org.freedesktop.NetworkManager.conf | ||
201 | 19 | @@ -2,6 +2,11 @@ | ||
202 | 20 | "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" | ||
203 | 21 | "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> | ||
204 | 22 | <busconfig> | ||
205 | 23 | + <policy group="sudo"> | ||
206 | 24 | + <allow send_destination="org.freedesktop.NetworkManager"/> | ||
207 | 25 | + <allow send_interface="org.freedesktop.NetworkManager"/> | ||
208 | 26 | + <allow send_interface="org.freedesktop.NetworkManager.SecretAgent"/> | ||
209 | 27 | + </policy> | ||
210 | 28 | <policy user="root"> | ||
211 | 29 | <allow own="org.freedesktop.NetworkManager"/> | ||
212 | 30 | <allow send_destination="org.freedesktop.NetworkManager"/> | ||
213 | 0 | 31 | ||
214 | === modified file 'debian/patches/ignore_rild_modem_devices.patch' | |||
215 | --- debian/patches/ignore_rild_modem_devices.patch 2016-04-07 19:30:51 +0000 | |||
216 | +++ debian/patches/ignore_rild_modem_devices.patch 2016-04-27 16:19:01 +0000 | |||
217 | @@ -1,23 +1,25 @@ | |||
218 | 1 | From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 1 | From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> |
219 | 2 | Subject: Ignore rmnet_usbX devices. | 2 | Subject: Ignore rmnet_usbX devices. |
220 | 3 | --- | 3 | --- |
223 | 4 | src/nm-manager.c | 6 ++++++ | 4 | src/nm-manager.c | 8 ++++++++ |
224 | 5 | 1 file changed, 6 insertions(+) | 5 | 1 file changed, 8 insertions(+) |
225 | 6 | 6 | ||
226 | 7 | Index: b/src/nm-manager.c | 7 | Index: b/src/nm-manager.c |
227 | 8 | =================================================================== | 8 | =================================================================== |
228 | 9 | --- a/src/nm-manager.c | 9 | --- a/src/nm-manager.c |
229 | 10 | +++ b/src/nm-manager.c | 10 | +++ b/src/nm-manager.c |
233 | 11 | @@ -2042,6 +2042,12 @@ platform_link_added (NMManager *self, | 11 | @@ -2078,6 +2078,14 @@ platform_link_added (NMManager *self, |
234 | 12 | } | 12 | gboolean ignore = FALSE; |
235 | 13 | } | 13 | gs_free_error GError *error = NULL; |
236 | 14 | 14 | ||
242 | 15 | + /* Ignore rmnet_usb devices, which will be handled by their modem parent | 15 | + /* Ignore rild modem devices, which will be handled by their modem parent */ |
243 | 16 | + */ | 16 | + if (g_strstr_len (plink->name, NM_STRLEN ("rmnet"), "rmnet") || |
244 | 17 | + if (!strncmp (plink->name, "rmnet_usb", NM_STRLEN ("rmnet_usb")) || | 17 | + g_strstr_len (plink->name, NM_STRLEN ("rev_rmnet"), "rev_rmnet") || |
245 | 18 | + !strncmp (plink->name, "ccmni", NM_STRLEN ("ccmni"))) | 18 | + g_strstr_len (plink->name, NM_STRLEN ("ccmni"), "ccmni")) { |
246 | 19 | + return; | 19 | + _LOGW (LOGD_HW, "Ignoring rild modem device: %s", plink->name); |
247 | 20 | + return; | ||
248 | 21 | + } | ||
249 | 20 | + | 22 | + |
253 | 21 | if (device == NULL) { | 23 | device = nm_device_factory_create_device (factory, plink->name, plink, NULL, &ignore, &error); |
254 | 22 | switch (plink->type) { | 24 | if (!device) { |
255 | 23 | case NM_LINK_TYPE_WWAN_ETHERNET: | 25 | if (!ignore) { |
256 | 24 | 26 | ||
257 | === modified file 'debian/patches/lp1099983_ignore-p2p-wifi-devices.patch' | |||
258 | --- debian/patches/lp1099983_ignore-p2p-wifi-devices.patch 2016-03-03 22:47:33 +0000 | |||
259 | +++ debian/patches/lp1099983_ignore-p2p-wifi-devices.patch 2016-04-27 16:19:01 +0000 | |||
260 | @@ -2,27 +2,28 @@ | |||
261 | 2 | Subject: Ignore p2p0 wifi devices from android. | 2 | Subject: Ignore p2p0 wifi devices from android. |
262 | 3 | 3 | ||
263 | 4 | --- | 4 | --- |
266 | 5 | src/nm-manager.c | 10 ++++++++++ | 5 | src/nm-manager.c | 11 +++++++++++ |
267 | 6 | 1 file changed, 10 insertions(+) | 6 | 1 file changed, 11 insertions(+) |
268 | 7 | 7 | ||
269 | 8 | Index: b/src/nm-manager.c | 8 | Index: b/src/nm-manager.c |
270 | 9 | =================================================================== | 9 | =================================================================== |
271 | 10 | --- a/src/nm-manager.c | 10 | --- a/src/nm-manager.c |
272 | 11 | +++ b/src/nm-manager.c | 11 | +++ b/src/nm-manager.c |
276 | 12 | @@ -2048,6 +2048,16 @@ platform_link_added (NMManager *self, | 12 | @@ -2086,6 +2086,17 @@ platform_link_added (NMManager *self, |
277 | 13 | !strncmp (plink->name, "ccmni", NM_STRLEN ("ccmni"))) | 13 | return; |
278 | 14 | return; | 14 | } |
279 | 15 | 15 | ||
289 | 16 | + /* | 16 | + /* |
290 | 17 | + * Ubuntu: Explicitly unmanage p2p Wi-Fi devices exposed by Android JB Wi-Fi drivers. | 17 | + * Ubuntu: Explicitly unmanage all p2p Wi-Fi devices which are |
291 | 18 | + */ | 18 | + * managed externally in the case of Wi-Fi Direct. |
292 | 19 | + NMDeviceType devtype = nm_device_get_device_type (device); | 19 | + */ |
293 | 20 | + if ((plink->type == NM_LINK_TYPE_WIFI) | 20 | + NMDeviceType devtype = nm_device_get_device_type (device); |
294 | 21 | + && !strncmp (plink->name, "p2p0", NM_STRLEN ("p2p0"))) { | 21 | + if ((plink->type == NM_LINK_TYPE_WIFI) |
295 | 22 | + nm_log_info (LOGD_HW, "(%s): ignoring P2P wireless iface", plink->name); | 22 | + && g_strstr_len (plink->name, NM_STRLEN ("p2p"), "p2p")) { |
296 | 23 | + return; | 23 | + nm_log_info (LOGD_HW, "(%s): ignoring P2P wireless iface", plink->name); |
297 | 24 | + } | 24 | + return; |
298 | 25 | + } | ||
299 | 25 | + | 26 | + |
303 | 26 | if (device == NULL) { | 27 | device = nm_device_factory_create_device (factory, plink->name, plink, NULL, &ignore, &error); |
304 | 27 | switch (plink->type) { | 28 | if (!device) { |
305 | 28 | case NM_LINK_TYPE_WWAN_ETHERNET: | 29 | if (!ignore) { |
306 | 29 | 30 | ||
307 | === modified file 'debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch' | |||
308 | --- debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch 2016-03-03 22:47:33 +0000 | |||
309 | +++ debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch 2016-04-27 16:19:01 +0000 | |||
310 | @@ -7,29 +7,26 @@ | |||
311 | 7 | timeout ( which defaults to 300s ). | 7 | timeout ( which defaults to 300s ). |
312 | 8 | 8 | ||
313 | 9 | Bug: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1461593 | 9 | Bug: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1461593 |
320 | 10 | 10 | --- | |
321 | 11 | --- | 11 | src/nm-policy.c | 34 +++++++++++++++++++++++++++------- |
322 | 12 | 12 | 1 file changed, 27 insertions(+), 7 deletions(-) | |
317 | 13 | --- | ||
318 | 14 | src/nm-policy.c | 36 +++++++++++++++++++++++++++++------- | ||
319 | 15 | 1 file changed, 29 insertions(+), 7 deletions(-) | ||
323 | 16 | 13 | ||
324 | 17 | Index: b/src/nm-policy.c | 14 | Index: b/src/nm-policy.c |
325 | 18 | =================================================================== | 15 | =================================================================== |
326 | 19 | --- a/src/nm-policy.c | 16 | --- a/src/nm-policy.c |
327 | 20 | +++ b/src/nm-policy.c | 17 | +++ b/src/nm-policy.c |
329 | 21 | @@ -901,7 +901,7 @@ sleeping_changed (NMManager *manager, GP | 18 | @@ -931,7 +931,7 @@ sleeping_changed (NMManager *manager, GP |
330 | 22 | } | 19 | } |
331 | 23 | 20 | ||
332 | 24 | static void | 21 | static void |
335 | 25 | -schedule_activate_check (NMPolicy *policy, NMDevice *device) | 22 | -schedule_activate_check (NMPolicy *self, NMDevice *device) |
336 | 26 | +schedule_activate_check (NMPolicy *policy, NMDevice *device, guint delay) | 23 | +schedule_activate_check (NMPolicy *self, NMDevice *device, guint delay) |
337 | 27 | { | 24 | { |
339 | 28 | NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); | 25 | NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (self); |
340 | 29 | ActivateData *data; | 26 | ActivateData *data; |
344 | 30 | @@ -930,7 +930,12 @@ schedule_activate_check (NMPolicy *polic | 27 | @@ -960,7 +960,12 @@ schedule_activate_check (NMPolicy *self, |
345 | 31 | data = g_malloc0 (sizeof (ActivateData)); | 28 | data = g_slice_new0 (ActivateData); |
346 | 32 | data->policy = policy; | 29 | data->policy = self; |
347 | 33 | data->device = g_object_ref (device); | 30 | data->device = g_object_ref (device); |
348 | 34 | - data->autoactivate_id = g_idle_add (auto_activate_device, data); | 31 | - data->autoactivate_id = g_idle_add (auto_activate_device, data); |
349 | 35 | + | 32 | + |
350 | @@ -41,7 +38,7 @@ | |||
351 | 41 | priv->pending_activation_checks = g_slist_append (priv->pending_activation_checks, data); | 38 | priv->pending_activation_checks = g_slist_append (priv->pending_activation_checks, data); |
352 | 42 | } | 39 | } |
353 | 43 | 40 | ||
355 | 44 | @@ -1125,6 +1130,7 @@ device_state_changed (NMDevice *device, | 41 | @@ -1155,6 +1160,7 @@ device_state_changed (NMDevice *device, |
356 | 45 | NMIP4Config *ip4_config; | 42 | NMIP4Config *ip4_config; |
357 | 46 | NMIP6Config *ip6_config; | 43 | NMIP6Config *ip6_config; |
358 | 47 | NMSettingConnection *s_con = NULL; | 44 | NMSettingConnection *s_con = NULL; |
359 | @@ -49,64 +46,69 @@ | |||
360 | 49 | 46 | ||
361 | 50 | switch (new_state) { | 47 | switch (new_state) { |
362 | 51 | case NM_DEVICE_STATE_FAILED: | 48 | case NM_DEVICE_STATE_FAILED: |
364 | 52 | @@ -1153,9 +1159,14 @@ device_state_changed (NMDevice *device, | 49 | @@ -1172,7 +1178,7 @@ device_state_changed (NMDevice *device, |
365 | 50 | |||
366 | 51 | nm_settings_connection_set_autoconnect_blocked_reason (connection, NM_DEVICE_STATE_REASON_NO_SECRETS); | ||
367 | 52 | } else if (tries > 0) { | ||
368 | 53 | - _LOGD (LOGD_DEVICE, "connection '%s' failed to autoconnect; %d tries left", | ||
369 | 54 | + _LOGI (LOGD_DEVICE, "connection '%s' failed to autoconnect; %d tries left", | ||
370 | 55 | nm_settings_connection_get_id (connection), tries); | ||
371 | 56 | nm_settings_connection_set_autoconnect_retries (connection, tries - 1); | ||
372 | 57 | } | ||
373 | 58 | @@ -1183,6 +1189,10 @@ device_state_changed (NMDevice *device, | ||
374 | 53 | /* Schedule a handler to reset retries count */ | 59 | /* Schedule a handler to reset retries count */ |
375 | 54 | if (!priv->reset_retries_id) { | 60 | if (!priv->reset_retries_id) { |
376 | 55 | gint32 retry_time = nm_settings_connection_get_autoconnect_retry_time (connection); | 61 | gint32 retry_time = nm_settings_connection_get_autoconnect_retry_time (connection); |
377 | 56 | + gint32 actual_time = MAX (0, retry_time - nm_utils_get_monotonic_timestamp_s ()); | 62 | + gint32 actual_time = MAX (0, retry_time - nm_utils_get_monotonic_timestamp_s ()); |
378 | 57 | + | 63 | + |
382 | 58 | + nm_log_info (LOGD_DEVICE, "Disabling autoconnect for connection '%s'; setting retry of %d.", | 64 | + _LOGI (LOGD_DEVICE, "Disabling autoconnect for connection '%s'; setting retry of %d.", |
383 | 59 | + nm_connection_get_id (NM_CONNECTION (connection)), actual_time); | 65 | + nm_connection_get_id (NM_CONNECTION (connection)), actual_time); |
381 | 60 | + | ||
384 | 61 | 66 | ||
385 | 62 | g_warn_if_fail (retry_time != 0); | 67 | g_warn_if_fail (retry_time != 0); |
393 | 63 | - priv->reset_retries_id = g_timeout_add_seconds (MAX (0, retry_time - nm_utils_get_monotonic_timestamp_s ()), reset_connections_retries, policy); | 68 | priv->reset_retries_id = g_timeout_add_seconds (MAX (0, retry_time - nm_utils_get_monotonic_timestamp_s ()), reset_connections_retries, self); |
394 | 64 | + priv->reset_retries_id = g_timeout_add_seconds (actual_time, reset_connections_retries, policy); | 69 | @@ -1250,7 +1260,17 @@ device_state_changed (NMDevice *device, |
395 | 65 | } | 70 | update_routing_and_dns (self, FALSE); |
389 | 66 | } | ||
390 | 67 | nm_connection_clear_secrets (NM_CONNECTION (connection)); | ||
391 | 68 | @@ -1220,7 +1231,18 @@ device_state_changed (NMDevice *device, | ||
392 | 69 | update_routing_and_dns (policy, FALSE); | ||
396 | 70 | 71 | ||
397 | 71 | /* Device is now available for auto-activation */ | 72 | /* Device is now available for auto-activation */ |
400 | 72 | - schedule_activate_check (policy, device); | 73 | - schedule_activate_check (self, device); |
399 | 73 | + | ||
401 | 74 | + if (nm_device_get_device_type (device) == NM_DEVICE_TYPE_MODEM) | 74 | + if (nm_device_get_device_type (device) == NM_DEVICE_TYPE_MODEM) |
402 | 75 | + delay = 5; | 75 | + delay = 5; |
403 | 76 | + | 76 | + |
404 | 77 | + if (connection) | 77 | + if (connection) |
407 | 78 | + nm_log_info (LOGD_DEVICE, "Connection '%s' disconnected, scheduling activate_check in %u seconds.", | 78 | + _LOGI (LOGD_DEVICE, "Connection '%s' disconnected, scheduling activate_check in %u seconds.", |
408 | 79 | + nm_connection_get_id (NM_CONNECTION (connection)), delay); | 79 | + nm_connection_get_id (NM_CONNECTION (connection)), delay); |
409 | 80 | + else | 80 | + else |
412 | 81 | + nm_log_info (LOGD_DEVICE, "Device '%s' has no connection; scheduling activate_check in %u seconds.", | 81 | + _LOGI (LOGD_DEVICE, "Device '%s' has no connection; scheduling activate_check in %u seconds.", |
413 | 82 | + nm_device_get_iface (device), delay); | 82 | + nm_device_get_iface (device), delay); |
414 | 83 | + | 83 | + |
416 | 84 | + schedule_activate_check (policy, device, delay); | 84 | + schedule_activate_check (self, device, delay); |
417 | 85 | break; | 85 | break; |
418 | 86 | 86 | ||
419 | 87 | case NM_DEVICE_STATE_PREPARE: | 87 | case NM_DEVICE_STATE_PREPARE: |
423 | 88 | @@ -1330,13 +1352,13 @@ device_autoconnect_changed (NMDevice *de | 88 | @@ -1363,7 +1383,7 @@ device_autoconnect_changed (NMDevice *de |
424 | 89 | gpointer user_data) | 89 | NMPolicy *self = priv->self; |
425 | 90 | { | 90 | |
426 | 91 | if (nm_device_autoconnect_allowed (device)) | 91 | if (nm_device_autoconnect_allowed (device)) |
440 | 92 | - schedule_activate_check ((NMPolicy *) user_data, device); | 92 | - schedule_activate_check (self, device); |
441 | 93 | + schedule_activate_check ((NMPolicy *) user_data, device, 0); | 93 | + schedule_activate_check (self, device, 0); |
442 | 94 | } | 94 | } |
443 | 95 | 95 | ||
444 | 96 | static void | 96 | static void |
445 | 97 | device_recheck_auto_activate (NMDevice *device, gpointer user_data) | 97 | @@ -1372,7 +1392,7 @@ device_recheck_auto_activate (NMDevice * |
446 | 98 | { | 98 | NMPolicyPrivate *priv = user_data; |
447 | 99 | - schedule_activate_check (NM_POLICY (user_data), device); | 99 | NMPolicy *self = priv->self; |
448 | 100 | + schedule_activate_check (NM_POLICY (user_data), device, 0); | 100 | |
449 | 101 | } | 101 | - schedule_activate_check (self, device); |
450 | 102 | 102 | + schedule_activate_check (self, device, 0); | |
451 | 103 | typedef struct { | 103 | } |
452 | 104 | @@ -1561,7 +1583,7 @@ schedule_activate_all (NMPolicy *policy) | 104 | |
453 | 105 | static void | ||
454 | 106 | @@ -1586,7 +1606,7 @@ schedule_activate_all (NMPolicy *self) | ||
455 | 105 | const GSList *iter; | 107 | const GSList *iter; |
456 | 106 | 108 | ||
457 | 107 | for (iter = nm_manager_get_devices (priv->manager); iter; iter = g_slist_next (iter)) | 109 | for (iter = nm_manager_get_devices (priv->manager); iter; iter = g_slist_next (iter)) |
460 | 108 | - schedule_activate_check (policy, NM_DEVICE (iter->data)); | 110 | - schedule_activate_check (self, NM_DEVICE (iter->data)); |
461 | 109 | + schedule_activate_check (policy, NM_DEVICE (iter->data), 0); | 111 | + schedule_activate_check (self, NM_DEVICE (iter->data), 0); |
462 | 110 | } | 112 | } |
463 | 111 | 113 | ||
464 | 112 | static void | 114 | static void |
465 | 113 | 115 | ||
466 | === modified file 'debian/patches/series' | |||
467 | --- debian/patches/series 2016-04-07 21:09:58 +0000 | |||
468 | +++ debian/patches/series 2016-04-27 16:19:01 +0000 | |||
469 | @@ -35,7 +35,7 @@ | |||
470 | 35 | wwan-add-ofono-modem-support.patch | 35 | wwan-add-ofono-modem-support.patch |
471 | 36 | lp1461593-add-nm-settings-connection-reset-retries-methods.patch | 36 | lp1461593-add-nm-settings-connection-reset-retries-methods.patch |
472 | 37 | add_ofono_settings_support.patch | 37 | add_ofono_settings_support.patch |
474 | 38 | #lp1461593-add-modem-reconnect-delay-to-policy.patch | 38 | lp1461593-add-modem-reconnect-delay-to-policy.patch |
475 | 39 | lp1445080-modify-device-modem-avail.patch | 39 | lp1445080-modify-device-modem-avail.patch |
476 | 40 | 40 | ||
477 | 41 | # killswitch | 41 | # killswitch |
478 | @@ -44,3 +44,6 @@ | |||
479 | 44 | # more fixes | 44 | # more fixes |
480 | 45 | conditional_libteam_tests.patch | 45 | conditional_libteam_tests.patch |
481 | 46 | disable_general_with_expect_test.patch | 46 | disable_general_with_expect_test.patch |
482 | 47 | dbus-conf-add-sudo-for-indicator-network.patch | ||
483 | 48 | wifi-wpas-inactive.patch | ||
484 | 49 | clear-requested-scan-when-supplicant-goes-down.patch | ||
485 | 47 | 50 | ||
486 | === added file 'debian/patches/wifi-wpas-inactive.patch' | |||
487 | --- debian/patches/wifi-wpas-inactive.patch 1970-01-01 00:00:00 +0000 | |||
488 | +++ debian/patches/wifi-wpas-inactive.patch 2016-04-27 16:19:01 +0000 | |||
489 | @@ -0,0 +1,30 @@ | |||
490 | 1 | --- | ||
491 | 2 | src/devices/wifi/nm-device-wifi.c | 15 +++++++++++++++ | ||
492 | 3 | 1 file changed, 15 insertions(+) | ||
493 | 4 | |||
494 | 5 | Index: b/src/devices/wifi/nm-device-wifi.c | ||
495 | 6 | =================================================================== | ||
496 | 7 | --- a/src/devices/wifi/nm-device-wifi.c | ||
497 | 8 | +++ b/src/devices/wifi/nm-device-wifi.c | ||
498 | 9 | @@ -1903,6 +1903,21 @@ supplicant_iface_state_cb (NMSupplicantI | ||
499 | 10 | else | ||
500 | 11 | _LOGI (LOGD_DEVICE | LOGD_WIFI, "supplicant interface keeps failing, giving up"); | ||
501 | 12 | break; | ||
502 | 13 | + case NM_SUPPLICANT_INTERFACE_STATE_INACTIVE: | ||
503 | 14 | + if (old_state == NM_SUPPLICANT_INTERFACE_STATE_SCANNING) { | ||
504 | 15 | + nm_log_warn (LOGD_HW | LOGD_WIFI, "(%s): supplicant state: SCANNING -> INACTIVE", | ||
505 | 16 | + nm_device_get_iface (NM_DEVICE (self))); | ||
506 | 17 | + | ||
507 | 18 | + if (priv->requested_scan) { | ||
508 | 19 | + nm_log_dbg (LOGD_WIFI_SCAN, "(%s): clearing requested_scan", | ||
509 | 20 | + nm_device_get_iface (NM_DEVICE (self))); | ||
510 | 21 | + | ||
511 | 22 | + priv->requested_scan = FALSE; | ||
512 | 23 | + } | ||
513 | 24 | + | ||
514 | 25 | + cancel_pending_scan (self); | ||
515 | 26 | + request_wireless_scan (self, NULL); | ||
516 | 27 | + } | ||
517 | 28 | default: | ||
518 | 29 | break; | ||
519 | 30 | } | ||
520 | 0 | 31 | ||
521 | === modified file 'debian/patches/wwan-add-ofono-modem-support.patch' | |||
522 | --- debian/patches/wwan-add-ofono-modem-support.patch 2016-04-08 14:49:37 +0000 | |||
523 | +++ debian/patches/wwan-add-ofono-modem-support.patch 2016-04-27 16:19:01 +0000 | |||
524 | @@ -9,13 +9,12 @@ | |||
525 | 9 | --- | 9 | --- |
526 | 10 | configure.ac | 9 | 10 | configure.ac | 9 |
527 | 11 | src/devices/wwan/Makefile.am | 7 | 11 | src/devices/wwan/Makefile.am | 7 |
531 | 12 | src/devices/wwan/nm-device-modem.c | 20 | 12 | src/devices/wwan/nm-modem-manager.c | 238 +++++ |
532 | 13 | src/devices/wwan/nm-modem-manager.c | 220 +++++ | 13 | src/devices/wwan/nm-modem-ofono.c | 1435 ++++++++++++++++++++++++++++++++++++ |
530 | 14 | src/devices/wwan/nm-modem-ofono.c | 1449 ++++++++++++++++++++++++++++++++++++ | ||
533 | 15 | src/devices/wwan/nm-modem-ofono.h | 64 + | 14 | src/devices/wwan/nm-modem-ofono.h | 64 + |
534 | 16 | src/devices/wwan/nm-modem.c | 8 | 15 | src/devices/wwan/nm-modem.c | 8 |
535 | 17 | src/nm-core-utils.c | 20 | 16 | src/nm-core-utils.c | 20 |
537 | 18 | 8 files changed, 1787 insertions(+), 10 deletions(-) | 17 | 7 files changed, 1762 insertions(+), 19 deletions(-) |
538 | 19 | 18 | ||
539 | 20 | Index: b/configure.ac | 19 | Index: b/configure.ac |
540 | 21 | =================================================================== | 20 | =================================================================== |
541 | @@ -93,58 +92,6 @@ | |||
542 | 93 | WWAN_SYMBOL_VIS_FILE=$(srcdir)/wwan-exports.ver | 92 | WWAN_SYMBOL_VIS_FILE=$(srcdir)/wwan-exports.ver |
543 | 94 | 93 | ||
544 | 95 | libnm_wwan_la_LDFLAGS = \ | 94 | libnm_wwan_la_LDFLAGS = \ |
545 | 96 | Index: b/src/devices/wwan/nm-device-modem.c | ||
546 | 97 | =================================================================== | ||
547 | 98 | --- a/src/devices/wwan/nm-device-modem.c | ||
548 | 99 | +++ b/src/devices/wwan/nm-device-modem.c | ||
549 | 100 | @@ -100,6 +100,7 @@ modem_prepare_result (NMModem *modem, | ||
550 | 101 | if (success) | ||
551 | 102 | nm_device_activate_schedule_stage2_device_config (device); | ||
552 | 103 | else { | ||
553 | 104 | + | ||
554 | 105 | if (reason == NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT) { | ||
555 | 106 | /* If the connect failed because the SIM PIN was wrong don't allow | ||
556 | 107 | * the device to be auto-activated anymore, which would risk locking | ||
557 | 108 | @@ -282,6 +283,16 @@ modem_state_cb (NMModem *modem, | ||
558 | 109 | } | ||
559 | 110 | } | ||
560 | 111 | |||
561 | 112 | + if (dev_state >= NM_DEVICE_STATE_DISCONNECTED && | ||
562 | 113 | + new_state == NM_MODEM_STATE_REGISTERED && old_state < NM_MODEM_STATE_REGISTERED) { | ||
563 | 114 | + | ||
564 | 115 | + nm_log_info (LOGD_MB, "(%s): modem re-registered; re-checking autoconnect", | ||
565 | 116 | + nm_device_get_iface (device)); | ||
566 | 117 | + | ||
567 | 118 | + g_object_set (G_OBJECT (device), NM_DEVICE_AUTOCONNECT, TRUE, NULL); | ||
568 | 119 | + nm_device_emit_recheck_auto_activate (device); | ||
569 | 120 | + } | ||
570 | 121 | + | ||
571 | 122 | if (new_state < NM_MODEM_STATE_CONNECTING && | ||
572 | 123 | old_state >= NM_MODEM_STATE_CONNECTING && | ||
573 | 124 | dev_state >= NM_DEVICE_STATE_NEED_AUTH && | ||
574 | 125 | @@ -345,6 +356,14 @@ device_state_changed (NMDevice *device, | ||
575 | 126 | nm_modem_state_to_string (nm_modem_get_state (priv->modem))); | ||
576 | 127 | } | ||
577 | 128 | |||
578 | 129 | + /* Block autoconnect until the modem is registered again */ | ||
579 | 130 | + if (new_state == NM_DEVICE_STATE_FAILED && nm_modem_get_state (priv->modem) == NM_MODEM_STATE_SEARCHING) { | ||
580 | 131 | + nm_log_info (LOGD_MB, "(%s): modem searching; disabling autoconnect", | ||
581 | 132 | + nm_device_get_iface (device)); | ||
582 | 133 | + | ||
583 | 134 | + g_object_set (G_OBJECT (device), NM_DEVICE_AUTOCONNECT, FALSE, NULL); | ||
584 | 135 | + } | ||
585 | 136 | + | ||
586 | 137 | nm_modem_device_state_changed (priv->modem, new_state, old_state, reason); | ||
587 | 138 | |||
588 | 139 | switch (reason) { | ||
589 | 140 | @@ -545,6 +564,7 @@ get_ip_iface_identifier (NMDevice *devic | ||
590 | 141 | |||
591 | 142 | g_return_val_if_fail (priv->modem, FALSE); | ||
592 | 143 | success = nm_modem_get_iid (priv->modem, out_iid); | ||
593 | 144 | + | ||
594 | 145 | if (!success) | ||
595 | 146 | success = NM_DEVICE_CLASS (nm_device_modem_parent_class)->get_ip_iface_identifier (device, out_iid); | ||
596 | 147 | return success; | ||
597 | 148 | Index: b/src/devices/wwan/nm-modem-manager.c | 95 | Index: b/src/devices/wwan/nm-modem-manager.c |
598 | 149 | =================================================================== | 96 | =================================================================== |
599 | 150 | --- a/src/devices/wwan/nm-modem-manager.c | 97 | --- a/src/devices/wwan/nm-modem-manager.c |
600 | @@ -288,7 +235,7 @@ | |||
601 | 288 | +{ | 235 | +{ |
602 | 289 | + gchar *name_owner; | 236 | + gchar *name_owner; |
603 | 290 | + | 237 | + |
605 | 291 | + name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (self->priv->ofono_proxy)); | 238 | + name_owner = g_dbus_proxy_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (self->priv->ofono_proxy)); |
606 | 292 | + if (name_owner) { | 239 | + if (name_owner) { |
607 | 293 | + /* Available! */ | 240 | + /* Available! */ |
608 | 294 | + ofono_appeared (self); | 241 | + ofono_appeared (self); |
609 | @@ -361,6 +308,35 @@ | |||
610 | 361 | 308 | ||
611 | 362 | static void | 309 | static void |
612 | 363 | modem_manager_poke_cb (GDBusConnection *connection, | 310 | modem_manager_poke_cb (GDBusConnection *connection, |
613 | 311 | @@ -233,19 +415,19 @@ modem_manager_poke_cb (GDBusConnection * | ||
614 | 312 | |||
615 | 313 | result = g_dbus_connection_call_finish (connection, res, &error); | ||
616 | 314 | if (error) { | ||
617 | 315 | - /* Ignore common errors when MM is not installed and such */ | ||
618 | 316 | - if ( !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN) | ||
619 | 317 | - && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_EXEC_FAILED) | ||
620 | 318 | - && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_FORK_FAILED) | ||
621 | 319 | - && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_FAILED) | ||
622 | 320 | - && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_TIMEOUT) | ||
623 | 321 | + nm_log_warn (LOGD_MB, "error poking ModemManager: %s", | ||
624 | 322 | + error ? error->message : ""); | ||
625 | 323 | + | ||
626 | 324 | + /* Don't reschedule poke is MM service doesn't exist. */ | ||
627 | 325 | + if (!g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN) | ||
628 | 326 | && !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND)) { | ||
629 | 327 | - nm_log_dbg (LOGD_MB, "error poking ModemManager: %s", error->message); | ||
630 | 328 | + | ||
631 | 329 | + /* Setup timeout to relaunch */ | ||
632 | 330 | + schedule_modem_manager_relaunch (self, MODEM_POKE_INTERVAL); | ||
633 | 331 | } | ||
634 | 332 | + | ||
635 | 333 | g_error_free (error); | ||
636 | 334 | |||
637 | 335 | - /* Setup timeout to relaunch */ | ||
638 | 336 | - schedule_modem_manager_relaunch (self, MODEM_POKE_INTERVAL); | ||
639 | 337 | } else | ||
640 | 338 | g_variant_unref (result); | ||
641 | 339 | |||
642 | 364 | @@ -336,22 +518,44 @@ manager_new_ready (GObject *source, | 340 | @@ -336,22 +518,44 @@ manager_new_ready (GObject *source, |
643 | 365 | static void | 341 | static void |
644 | 366 | ensure_client (NMModemManager *self) | 342 | ensure_client (NMModemManager *self) |
645 | @@ -496,7 +472,7 @@ | |||
646 | 496 | =================================================================== | 472 | =================================================================== |
647 | 497 | --- /dev/null | 473 | --- /dev/null |
648 | 498 | +++ b/src/devices/wwan/nm-modem-ofono.c | 474 | +++ b/src/devices/wwan/nm-modem-ofono.c |
650 | 499 | @@ -0,0 +1,1449 @@ | 475 | @@ -0,0 +1,1435 @@ |
651 | 500 | +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ | 476 | +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ |
652 | 501 | +/* NetworkManager -- Network link manager | 477 | +/* NetworkManager -- Network link manager |
653 | 502 | + * | 478 | + * |
654 | @@ -709,12 +685,7 @@ | |||
655 | 709 | + nm_log_dbg (LOGD_MB, "(%s): modem disconnected", | 685 | + nm_log_dbg (LOGD_MB, "(%s): modem disconnected", |
656 | 710 | + nm_modem_get_uid (NM_MODEM (self))); | 686 | + nm_modem_get_uid (NM_MODEM (self))); |
657 | 711 | + | 687 | + |
664 | 712 | + /* NOTES(1.2): This doesn't accomplish anything as none of the attributes that | 688 | + update_modem_state (self); |
659 | 713 | + * are checked by update_modem_state are changed by this function! | ||
660 | 714 | + * | ||
661 | 715 | + * update_modem_state (self); | ||
662 | 716 | + */ | ||
663 | 717 | + | ||
665 | 718 | + disconnect_context_complete (ctx); | 689 | + disconnect_context_complete (ctx); |
666 | 719 | +} | 690 | +} |
667 | 720 | + | 691 | + |
668 | @@ -889,7 +860,7 @@ | |||
669 | 889 | + &error); | 860 | + &error); |
670 | 890 | + if (!v_properties) { | 861 | + if (!v_properties) { |
671 | 891 | + g_dbus_error_strip_remote_error (error); | 862 | + g_dbus_error_strip_remote_error (error); |
673 | 892 | + nm_log_warn (LOGD_BT, "(%s) error getting sim properties: %s", | 863 | + nm_log_warn (LOGD_MB, "(%s) error getting sim properties: %s", |
674 | 893 | + nm_modem_get_uid (NM_MODEM (self)), | 864 | + nm_modem_get_uid (NM_MODEM (self)), |
675 | 894 | + error->message); | 865 | + error->message); |
676 | 895 | + g_error_free (error); | 866 | + g_error_free (error); |
677 | @@ -900,7 +871,7 @@ | |||
678 | 900 | + | 871 | + |
679 | 901 | + v_dict = g_variant_get_child_value (v_properties, 0); | 872 | + v_dict = g_variant_get_child_value (v_properties, 0); |
680 | 902 | + if (!v_dict) { | 873 | + if (!v_dict) { |
682 | 903 | + nm_log_warn (LOGD_BT, "(%s) error getting sim properties: no v_dict", | 874 | + nm_log_warn (LOGD_MB, "(%s) error getting sim properties: no v_dict", |
683 | 904 | + nm_modem_get_uid (NM_MODEM (self))); | 875 | + nm_modem_get_uid (NM_MODEM (self))); |
684 | 905 | + return; | 876 | + return; |
685 | 906 | + } | 877 | + } |
686 | @@ -1002,7 +973,7 @@ | |||
687 | 1002 | + gboolean attached = g_variant_get_boolean (v); | 973 | + gboolean attached = g_variant_get_boolean (v); |
688 | 1003 | + | 974 | + |
689 | 1004 | + nm_log_dbg (LOGD_MB, "(%s): Attached: %s", | 975 | + nm_log_dbg (LOGD_MB, "(%s): Attached: %s", |
691 | 1005 | + nm_modem_get_uid (NM_MODEM (self)), property ? "True" : "False"); | 976 | + nm_modem_get_uid (NM_MODEM (self)), attached ? "True" : "False"); |
692 | 1006 | + | 977 | + |
693 | 1007 | + if (priv->gprs_attached != attached) { | 978 | + if (priv->gprs_attached != attached) { |
694 | 1008 | + priv->gprs_attached = attached; | 979 | + priv->gprs_attached = attached; |
695 | @@ -1046,7 +1017,7 @@ | |||
696 | 1046 | + &error); | 1017 | + &error); |
697 | 1047 | + if (!v_properties) { | 1018 | + if (!v_properties) { |
698 | 1048 | + g_dbus_error_strip_remote_error (error); | 1019 | + g_dbus_error_strip_remote_error (error); |
700 | 1049 | + nm_log_warn (LOGD_BT, "(%s) error getting connman properties: %s", | 1020 | + nm_log_warn (LOGD_MB, "(%s) error getting connman properties: %s", |
701 | 1050 | + nm_modem_get_uid (NM_MODEM (self)), | 1021 | + nm_modem_get_uid (NM_MODEM (self)), |
702 | 1051 | + error->message); | 1022 | + error->message); |
703 | 1052 | + g_error_free (error); | 1023 | + g_error_free (error); |
704 | @@ -1226,7 +1197,7 @@ | |||
705 | 1226 | + &error); | 1197 | + &error); |
706 | 1227 | + if (!v_properties) { | 1198 | + if (!v_properties) { |
707 | 1228 | + g_dbus_error_strip_remote_error (error); | 1199 | + g_dbus_error_strip_remote_error (error); |
709 | 1229 | + nm_log_warn (LOGD_BT, "(%s) error getting modem properties: %s", | 1200 | + nm_log_warn (LOGD_MB, "(%s) error getting modem properties: %s", |
710 | 1230 | + nm_modem_get_uid (NM_MODEM (self)), | 1201 | + nm_modem_get_uid (NM_MODEM (self)), |
711 | 1231 | + error->message); | 1202 | + error->message); |
712 | 1232 | + g_error_free (error); | 1203 | + g_error_free (error); |
713 | @@ -1235,7 +1206,7 @@ | |||
714 | 1235 | + | 1206 | + |
715 | 1236 | + v_dict = g_variant_get_child_value (v_properties, 0); | 1207 | + v_dict = g_variant_get_child_value (v_properties, 0); |
716 | 1237 | + if (!v_dict) { | 1208 | + if (!v_dict) { |
718 | 1238 | + nm_log_warn (LOGD_BT, "(%s) error getting modem properties: no v_dict", | 1209 | + nm_log_warn (LOGD_MB, "(%s) error getting modem properties: no v_dict", |
719 | 1239 | + nm_modem_get_uid (NM_MODEM (self))); | 1210 | + nm_modem_get_uid (NM_MODEM (self))); |
720 | 1240 | + return; | 1211 | + return; |
721 | 1241 | + } | 1212 | + } |
722 | @@ -1331,14 +1302,6 @@ | |||
723 | 1331 | + nm_log_dbg (LOGD_MB, "PropertyChanged: %s", property); | 1302 | + nm_log_dbg (LOGD_MB, "PropertyChanged: %s", property); |
724 | 1332 | + | 1303 | + |
725 | 1333 | + /* | 1304 | + /* |
726 | 1334 | + * 0.9.10.x: | ||
727 | 1335 | + * | ||
728 | 1336 | + * The old code got PropertyChanged for Settings, and then immediately | ||
729 | 1337 | + * called 'GetProperties' to get the current values of 'Settings'. | ||
730 | 1338 | + * | ||
731 | 1339 | + * There's no need to do this, as the PropertyChanged has the value of | ||
732 | 1340 | + * 'Settings' as its payload!!! | ||
733 | 1341 | + * | ||
734 | 1342 | + * TODO: might be a good idea and re-factor this to mimic bluez-device, | 1305 | + * TODO: might be a good idea and re-factor this to mimic bluez-device, |
735 | 1343 | + * ie. have this function just check the key, and call a sub-func to | 1306 | + * ie. have this function just check the key, and call a sub-func to |
736 | 1344 | + * handle the action. | 1307 | + * handle the action. |
737 | @@ -1347,24 +1310,14 @@ | |||
738 | 1347 | + if (g_strcmp0 (property, "Settings") != 0) | 1310 | + if (g_strcmp0 (property, "Settings") != 0) |
739 | 1348 | + return; | 1311 | + return; |
740 | 1349 | + | 1312 | + |
741 | 1350 | + nm_log_dbg (LOGD_MB, "found 'Settings' DICTIONARY property"); | ||
742 | 1351 | + | ||
743 | 1352 | + if (nm_modem_get_state (NM_MODEM (self)) == NM_MODEM_STATE_CONNECTED && g_variant_n_children (v) <= 0) { | ||
744 | 1353 | + nm_log_warn (LOGD_MB, "ofono: (%s): Settings empty", nm_modem_get_uid (NM_MODEM (self))); | ||
745 | 1354 | + | ||
746 | 1355 | + goto out; | ||
747 | 1356 | + } | ||
748 | 1357 | + | ||
749 | 1358 | + nm_log_info (LOGD_MB, "ofono: (%s): IPv4 static configuration:", nm_modem_get_uid (NM_MODEM (self))); | ||
750 | 1359 | + | ||
751 | 1360 | + v_dict = g_variant_get_child_value (v, 0); | 1313 | + v_dict = g_variant_get_child_value (v, 0); |
752 | 1361 | + if (!v_dict) { | 1314 | + if (!v_dict) { |
754 | 1362 | + nm_log_warn (LOGD_BT, "ofono: (%s): error getting IPv4 Settings: no v_dict", | 1315 | + nm_log_warn (LOGD_MB, "ofono: (%s): error getting IPv4 Settings", |
755 | 1363 | + nm_modem_get_uid (NM_MODEM (self))); | 1316 | + nm_modem_get_uid (NM_MODEM (self))); |
757 | 1364 | + return; | 1317 | + goto out; |
758 | 1365 | + } | 1318 | + } |
759 | 1366 | + | 1319 | + |
761 | 1367 | + /* NOTE - 0.9.10x code didn't fail if 'Interface' missing */ | 1320 | + nm_log_info (LOGD_MB, "ofono: (%s): IPv4 static Settings:", nm_modem_get_uid (NM_MODEM (self))); |
762 | 1368 | + | 1321 | + |
763 | 1369 | + if (g_variant_lookup (v_dict, "Interface", "&s", &s)) { | 1322 | + if (g_variant_lookup (v_dict, "Interface", "&s", &s)) { |
764 | 1370 | + | 1323 | + |
765 | @@ -1376,7 +1329,7 @@ | |||
766 | 1376 | + NM_MODEM_IP4_METHOD, NM_MODEM_IP_METHOD_STATIC, | 1329 | + NM_MODEM_IP4_METHOD, NM_MODEM_IP_METHOD_STATIC, |
767 | 1377 | + NULL); | 1330 | + NULL); |
768 | 1378 | + } else { | 1331 | + } else { |
770 | 1379 | + nm_log_warn (LOGD_BT, "ofono: (%s): Settings 'Interface'; empty", | 1332 | + nm_log_warn (LOGD_MB, "ofono: (%s): Settings 'Interface'; empty", |
771 | 1380 | + nm_modem_get_uid (NM_MODEM (self))); | 1333 | + nm_modem_get_uid (NM_MODEM (self))); |
772 | 1381 | + goto out; | 1334 | + goto out; |
773 | 1382 | + } | 1335 | + } |
774 | @@ -1428,6 +1381,7 @@ | |||
775 | 1428 | + } else { | 1381 | + } else { |
776 | 1429 | + nm_log_warn (LOGD_MB, "ofono: (%s): Settings 'Address' missing", | 1382 | + nm_log_warn (LOGD_MB, "ofono: (%s): Settings 'Address' missing", |
777 | 1430 | + nm_modem_get_uid (NM_MODEM (self))); | 1383 | + nm_modem_get_uid (NM_MODEM (self))); |
778 | 1384 | + goto out; | ||
779 | 1431 | + } | 1385 | + } |
780 | 1432 | + | 1386 | + |
781 | 1433 | + if (g_variant_lookup (v_dict, "Netmask", "&s", &s)) { | 1387 | + if (g_variant_lookup (v_dict, "Netmask", "&s", &s)) { |
782 | @@ -1450,7 +1404,8 @@ | |||
783 | 1450 | + goto out; | 1404 | + goto out; |
784 | 1451 | + } | 1405 | + } |
785 | 1452 | + | 1406 | + |
787 | 1453 | + nm_log_info (LOGD_MB, " address %s/%d", addr_s, prefix); | 1407 | + nm_log_info (LOGD_MB, "ofono (%s) Address: %s/%d", |
788 | 1408 | + nm_modem_get_uid (NM_MODEM (self)), addr_s, prefix); | ||
789 | 1454 | + nm_ip4_config_add_address (priv->ip4_config, &addr); | 1409 | + nm_ip4_config_add_address (priv->ip4_config, &addr); |
790 | 1455 | + | 1410 | + |
791 | 1456 | + if (g_variant_lookup (v_dict, "Gateway", "&s", &s)) { | 1411 | + if (g_variant_lookup (v_dict, "Gateway", "&s", &s)) { |
792 | @@ -1477,7 +1432,7 @@ | |||
793 | 1477 | + | 1432 | + |
794 | 1478 | + while (*iter) { | 1433 | + while (*iter) { |
795 | 1479 | + if (ip_string_to_network_address (*iter, &address_network) && address_network > 0) { | 1434 | + if (ip_string_to_network_address (*iter, &address_network) && address_network > 0) { |
797 | 1480 | + nm_log_info (LOGD_MB, "ofono: (%s): DNS %s", | 1435 | + nm_log_info (LOGD_MB, "ofono: (%s): DNS: %s", |
798 | 1481 | + nm_modem_get_uid (NM_MODEM (self)), *iter); | 1436 | + nm_modem_get_uid (NM_MODEM (self)), *iter); |
799 | 1482 | + | 1437 | + |
800 | 1483 | + nm_ip4_config_add_nameserver (priv->ip4_config, address_network); | 1438 | + nm_ip4_config_add_nameserver (priv->ip4_config, address_network); |
801 | @@ -1489,13 +1444,15 @@ | |||
802 | 1489 | + *iter++; | 1444 | + *iter++; |
803 | 1490 | + } | 1445 | + } |
804 | 1491 | + | 1446 | + |
806 | 1492 | + /* TOOD: check for minimum NameServers >= 1? */ | 1447 | + if (iter == array) { |
807 | 1448 | + nm_log_warn (LOGD_MB, "ofono: (%s): Settings: 'DomainNameServers': none specified", | ||
808 | 1449 | + nm_modem_get_uid (NM_MODEM (self))); | ||
809 | 1450 | + g_free (array); | ||
810 | 1451 | + goto out; | ||
811 | 1452 | + } | ||
812 | 1493 | + | 1453 | + |
813 | 1494 | + g_free (array); | 1454 | + g_free (array); |
814 | 1495 | + } else { | 1455 | + } else { |
815 | 1496 | + | ||
816 | 1497 | + /* NOTE - 0.9.10.x would not throw an error in this case!!! */ | ||
817 | 1498 | + | ||
818 | 1499 | + nm_log_warn (LOGD_MB, "ofono: (%s): Settings 'DomainNameServers' missing", | 1456 | + nm_log_warn (LOGD_MB, "ofono: (%s): Settings 'DomainNameServers' missing", |
819 | 1500 | + nm_modem_get_uid (NM_MODEM (self))); | 1457 | + nm_modem_get_uid (NM_MODEM (self))); |
820 | 1501 | + goto out; | 1458 | + goto out; |
821 | @@ -1524,14 +1481,19 @@ | |||
822 | 1524 | + ret = TRUE; | 1481 | + ret = TRUE; |
823 | 1525 | + | 1482 | + |
824 | 1526 | +out: | 1483 | +out: |
832 | 1527 | + if (!ret) | 1484 | + if (nm_modem_get_state (NM_MODEM (self)) != NM_MODEM_STATE_CONNECTED) { |
833 | 1528 | + reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE; | 1485 | + nm_log_info (LOGD_MB, "ofono: (%s): emitting PREPARE_RESULT: %s", |
834 | 1529 | + | 1486 | + nm_modem_get_uid (NM_MODEM (self)), ret ? "TRUE" : "FALSE"); |
835 | 1530 | + nm_log_dbg (LOGD_MB, "(%s): DONE w/Settings; ret: %s", | 1487 | + |
836 | 1531 | + nm_modem_get_uid (NM_MODEM (self)), ret ? "TRUE" : "FALSE"); | 1488 | + if (!ret) |
837 | 1532 | + | 1489 | + reason = NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE; |
838 | 1533 | + if (nm_modem_get_state (NM_MODEM (self)) != NM_MODEM_STATE_CONNECTED) | 1490 | + |
839 | 1534 | + g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, ret, reason); | 1491 | + g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, ret, reason); |
840 | 1492 | + } else { | ||
841 | 1493 | + nm_log_warn (LOGD_MB, "ofono: (%s): MODEM_PPP_FAILED", nm_modem_get_uid (NM_MODEM (self))); | ||
842 | 1494 | + | ||
843 | 1495 | + g_signal_emit_by_name (self, NM_MODEM_PPP_FAILED, NM_DEVICE_STATE_REASON_PPP_FAILED); | ||
844 | 1496 | + } | ||
845 | 1535 | +} | 1497 | +} |
846 | 1536 | + | 1498 | + |
847 | 1537 | +static NMActStageReturn | 1499 | +static NMActStageReturn |
848 | 1538 | 1500 | ||
849 | === modified file 'debian/rules' | |||
850 | --- debian/rules 2016-04-06 20:01:36 +0000 | |||
851 | +++ debian/rules 2016-04-27 16:19:01 +0000 | |||
852 | @@ -2,11 +2,24 @@ | |||
853 | 2 | 2 | ||
854 | 3 | include /usr/share/dpkg/architecture.mk | 3 | include /usr/share/dpkg/architecture.mk |
855 | 4 | 4 | ||
857 | 5 | PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir) | 5 | # The following line is used by 1.2x desktop, but doesn't |
858 | 6 | # work on vivid or wily, preventing a source package from | ||
859 | 7 | # being built on this releases. This is because ppp 2.4.6-3* | ||
860 | 8 | # doesn't include dh_ppp. | ||
861 | 9 | # | ||
862 | 10 | # PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir) | ||
863 | 6 | DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) | 11 | DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) |
864 | 7 | 12 | ||
865 | 8 | %: | 13 | %: |
867 | 9 | dh $@ --with gir,systemd,autoreconf,ppp | 14 | # This is from the 1.2x desktop branch; ppp fails due to lack of |
868 | 15 | # dh_ppp ( see above ). This is a no-op until we fix pptp VPN | ||
869 | 16 | # on the phone. gir fails when building the binary packages with | ||
870 | 17 | # the error: | ||
871 | 18 | # | ||
872 | 19 | # dh_girepository: Could not find gir file for NM-1.0.typelib | ||
873 | 20 | # | ||
874 | 21 | # dh $@ --with gir,systemd,autoreconf,ppp | ||
875 | 22 | dh $@ --with systemd,autoreconf | ||
876 | 10 | 23 | ||
877 | 11 | autoreconf: | 24 | autoreconf: |
878 | 12 | gtkdocize --copy | 25 | gtkdocize --copy |
879 | @@ -19,14 +32,13 @@ | |||
880 | 19 | override_dh_auto_configure: | 32 | override_dh_auto_configure: |
881 | 20 | dh_auto_configure -- \ | 33 | dh_auto_configure -- \ |
882 | 21 | --libexecdir=/usr/lib/NetworkManager \ | 34 | --libexecdir=/usr/lib/NetworkManager \ |
883 | 22 | --with-pppd-plugin-dir=$(PPPD_PLUGIN_DIR) \ | ||
884 | 23 | --with-pppd=/usr/sbin/pppd \ | ||
885 | 24 | --with-resolvconf=/sbin/resolvconf \ | 35 | --with-resolvconf=/sbin/resolvconf \ |
886 | 25 | --with-dhclient=/sbin/dhclient \ | 36 | --with-dhclient=/sbin/dhclient \ |
887 | 26 | --with-iptables=/sbin/iptables \ | 37 | --with-iptables=/sbin/iptables \ |
888 | 27 | --with-dnsmasq=/usr/sbin/dnsmasq \ | 38 | --with-dnsmasq=/usr/sbin/dnsmasq \ |
889 | 28 | --with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \ | 39 | --with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \ |
890 | 29 | --with-systemdsystemunitdir=/lib/systemd/system \ | 40 | --with-systemdsystemunitdir=/lib/systemd/system \ |
891 | 41 | --with-systemd-journal=no \ | ||
892 | 30 | --with-udev-dir=/lib/udev \ | 42 | --with-udev-dir=/lib/udev \ |
893 | 31 | --with-crypto=gnutls \ | 43 | --with-crypto=gnutls \ |
894 | 32 | --with-session-tracking=systemd \ | 44 | --with-session-tracking=systemd \ |
895 | @@ -36,9 +48,9 @@ | |||
896 | 36 | --with-nmcli \ | 48 | --with-nmcli \ |
897 | 37 | --disable-more-warnings \ | 49 | --disable-more-warnings \ |
898 | 38 | --disable-modify-system \ | 50 | --disable-modify-system \ |
899 | 51 | --disable-bluez5 \ | ||
900 | 39 | --enable-polkit \ | 52 | --enable-polkit \ |
901 | 40 | --enable-polkit-agent \ | 53 | --enable-polkit-agent \ |
902 | 41 | --enable-ppp \ | ||
903 | 42 | --enable-ifupdown \ | 54 | --enable-ifupdown \ |
904 | 43 | --enable-config-plugin-ibft \ | 55 | --enable-config-plugin-ibft \ |
905 | 44 | --enable-introspection \ | 56 | --enable-introspection \ |
906 | @@ -46,8 +58,7 @@ | |||
907 | 46 | --enable-concheck \ | 58 | --enable-concheck \ |
908 | 47 | --enable-teamdctl=no \ | 59 | --enable-teamdctl=no \ |
909 | 48 | --enable-vala \ | 60 | --enable-vala \ |
912 | 49 | --with-tests \ | 61 | --with-tests |
911 | 50 | --enable-bluez5-dun | ||
913 | 51 | 62 | ||
914 | 52 | override_dh_install: | 63 | override_dh_install: |
915 | 53 | rm -vf $(CURDIR)/debian/tmp/etc/init.d/NetworkManager | 64 | rm -vf $(CURDIR)/debian/tmp/etc/init.d/NetworkManager |
916 | @@ -59,6 +70,9 @@ | |||
917 | 59 | # copy dnsmasq configuration | 70 | # copy dnsmasq configuration |
918 | 60 | mkdir -p debian/network-manager/etc/dnsmasq.d | 71 | mkdir -p debian/network-manager/etc/dnsmasq.d |
919 | 61 | cp debian/network-manager.dnsmasq debian/network-manager/etc/dnsmasq.d/network-manager | 72 | cp debian/network-manager.dnsmasq debian/network-manager/etc/dnsmasq.d/network-manager |
920 | 73 | mkdir -p debian/network-manager/etc/polkit-1/localauthority/50-local.d | ||
921 | 74 | cp debian/indicator-network.pkla \ | ||
922 | 75 | debian/network-manager/etc/polkit-1/localauthority/50-local.d/org.freedesktop.NetworkManager.pkla | ||
923 | 62 | 76 | ||
924 | 63 | override_dh_installinit: | 77 | override_dh_installinit: |
925 | 64 | dh_installinit --noscripts | 78 | dh_installinit --noscripts |
926 | @@ -67,7 +81,7 @@ | |||
927 | 67 | dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/ | 81 | dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/ |
928 | 68 | 82 | ||
929 | 69 | override_dh_strip: | 83 | override_dh_strip: |
931 | 70 | dh_strip --dbgsym-migration='network-manager-dbg (<< 1.1.91-2~)' | 84 | dh_strip --dbg-package=network-manager-dbg |
932 | 71 | 85 | ||
933 | 72 | override_dh_systemd_enable: | 86 | override_dh_systemd_enable: |
934 | 73 | dh_systemd_enable -pnetwork-manager NetworkManager-dispatcher.service | 87 | dh_systemd_enable -pnetwork-manager NetworkManager-dispatcher.service |
935 | @@ -81,9 +95,6 @@ | |||
936 | 81 | dh_systemd_start -pnetwork-manager --no-start NetworkManager-wait-online.service | 95 | dh_systemd_start -pnetwork-manager --no-start NetworkManager-wait-online.service |
937 | 82 | dh_systemd_start -pnetwork-manager --restart-after-upgrade NetworkManager.service | 96 | dh_systemd_start -pnetwork-manager --restart-after-upgrade NetworkManager.service |
938 | 83 | 97 | ||
939 | 84 | override_dh_ppp: | ||
940 | 85 | dh_ppp --breaks | ||
941 | 86 | |||
942 | 87 | override_dh_auto_test: | 98 | override_dh_auto_test: |
943 | 88 | ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS))) | 99 | ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS))) |
944 | 89 | make check || ( find . -name test-suite.log -exec cat {} \;; exit 1; ) | 100 | make check || ( find . -name test-suite.log -exec cat {} \;; exit 1; ) |