Merge lp:~mariusko/modemmanager/ubuntu.quantal_lp1057186 into lp:~modemmanager/modemmanager/ubuntu.quantal

[Marius B. Kotsbak]

[Mathieu Trudel-Lapierre (cyphermox)]

There's an extra file in teh changes:
 === added file 'debian/patches/git_via-plugin-has-vendor-product-string-probing-so-need_69fe9a8.patch'

Is this expected? If so, to be applied it should be added debian/patches/series, and definitely mentioned in debian/changelog.

Additionally, please target this to the /ubuntu branch instead of /ubuntu.quantal, SRU normally requires updates to be tested in the development release before being provided in proposed for releases.

review: Needs Fixing

[Marius B. Kotsbak (mariusko)]

> There's an extra file in teh changes:
> === added file 'debian/patches/git_via-plugin-has-vendor-product-string-
> probing-so-need_69fe9a8.patch'
>
> Is this expected? If so, to be applied it should be added
> debian/patches/series, and definitely mentioned in debian/changelog.

Well, I hoped it disappeared, but I probably didn't handle bzr correctly.

> Additionally, please target this to the /ubuntu branch instead of
> /ubuntu.quantal, SRU normally requires updates to be tested in the development
> release before being provided in proposed for releases.

It is a bit complicated, since there, the patch I mentioned above is probably needed, but if we there sync the latest 0.6 branch, that one is included and we just need the patch in this commit.

Anyway, the fix is not even upstream yet, we are awaiting for the reporter to test the fix first.

[lp:~mariusko/modemmanager/ubuntu.quantal_lp1057186]

165. By Marius B. Kotsbak on 2012-11-08

Replace patch git_huawei-better-detection-of-data-port-on-some-modems_18c3dfa.patch with two new from upstream:
huawei-better-detection-of-data-port-on-some-modems.patch and via-plugin-has-vendor-product-string-probing-so-need

166. By Marius B. Kotsbak on 2012-11-08

Fix Debian version number.

167. By Marius B. Kotsbak on 2012-11-08

Formating error in changelog file.

168. By Marius B. Kotsbak on 2012-11-08

Remove patch 0001-via-plugin-has-vendor-product-string-probing-so-need.patch as it applies to newer versions than
is currently in Quantal.

[Mathieu Trudel-Lapierre (cyphermox)]

This would certainly no longer apply to any currently supported release of Ubuntu; closing as "Rejected". Futhermore, it looks like the bug is Fix Released.

review: Disapprove

Unmerged revisions

168. By Marius B. Kotsbak on 2012-11-08

Remove patch 0001-via-plugin-has-vendor-product-string-probing-so-need.patch as it applies to newer versions than
is currently in Quantal.

167. By Marius B. Kotsbak on 2012-11-08

Formating error in changelog file.

166. By Marius B. Kotsbak on 2012-11-08

Fix Debian version number.

165. By Marius B. Kotsbak on 2012-11-08

Replace patch git_huawei-better-detection-of-data-port-on-some-modems_18c3dfa.patch with two new from upstream:
huawei-better-detection-of-data-port-on-some-modems.patch and via-plugin-has-vendor-product-string-probing-so-need

164. By Marius B. Kotsbak on 2012-10-24

git_huawei-better-detection-of-data-port-on-some-modems_18c3dfa.patch:
fix for regression since Precise for Huawei E173 (LP: #1057186)

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-28 00:46:34 +0000
+++ debian/changelog	2012-11-08 16:29:20 +0000
@@ -1,3 +1,18 @@
+
+modemmanager (0.6.0.0.really-0ubuntu2~fix.lp1057186ubuntu1) quantal; urgency=low
+
+  * Replace patch  git_huawei-better-detection-of-data-port-on-some-modems_18c3dfa.patch with new patch:
+    huawei-better-detection-of-data-port-on-some-modems.patch
+
+ -- Marius Kotsbak <marius@marius-T1005>  Thu, 08 Nov 2012 16:49:30 +0100
+
+modemmanager (0.6.0.0.really-0ubuntu2~fix-lp1057186) quantal; urgency=low
+
+  * git_huawei-better-detection-of-data-port-on-some-modems_18c3dfa.patch:
+    fix for regression since Precise for Huawei E173 (LP: #1057186)
+
+ -- Marius Kotsbak <[e-mail]>  Wed, 24 Oct 2012 16:08:32 +0200
+
 modemmanager (0.6.0.0-0ubuntu3) quantal; urgency=low
 
   * debian/patches/git_lte_4g_parsing_90489ae.patch,

=== added file 'debian/patches/0001-huawei-better-detection-of-data-port-on-some-modems.patch'
--- debian/patches/0001-huawei-better-detection-of-data-port-on-some-modems.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-huawei-better-detection-of-data-port-on-some-modems.patch	2012-11-08 16:29:20 +0000
@@ -0,0 +1,51 @@
+From 82356aa6ea841d739e06e1cd97734702e8fc98f1 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <[e-mail]>
+Date: Thu, 8 Nov 2012 15:59:12 +0100
+Subject: [PATCH] huawei: better detection of data port on some modems
+
+Some devices (e173) appear to lie about NDIS support; GETPORTMODE reports NDIS
+is enabled, but that port is actually the MDM port and responds to AT commands.
+So, if we get a port reported as NDIS and none reported as MDM, use the one
+reported as NDIS for PPP.
+
+https://bugs.launchpad.net/ubuntu/+source/modemmanager/+bug/1057186
+---
+ plugins/mm-plugin-huawei.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/mm-plugin-huawei.c b/plugins/mm-plugin-huawei.c
+index fc1a23f..534d1a3 100644
+--- a/plugins/mm-plugin-huawei.c
++++ b/plugins/mm-plugin-huawei.c
+@@ -49,6 +49,7 @@ mm_plugin_create (void)
+ 
+ #define TAG_HUAWEI_PCUI_PORT "huawei-pcui-port"
+ #define TAG_HUAWEI_MODEM_PORT "huawei-modem-port"
++#define TAG_HUAWEI_NDIS_PORT "huawei-ndis-port"
+ #define TAG_HUAWEI_DIAG_PORT "huawei-diag-port"
+ #define TAG_GETPORTMODE_SUPPORTED "getportmode-supported"
+ 
+@@ -114,7 +115,8 @@ getportmode_response_cb (MMPluginBaseSupportsTask *task,
+         MMPlugin *plugin = mm_plugin_base_supports_task_get_plugin (task);
+ 
+         cache_port_mode (plugin, response->str, "PCUI:", TAG_HUAWEI_PCUI_PORT);
+-        cache_port_mode (plugin, response->str, "MDM:", TAG_HUAWEI_MODEM_PORT);
++        cache_port_mode (plugin, response->str, "MDM:",  TAG_HUAWEI_MODEM_PORT);
++        cache_port_mode (plugin, response->str, "NDIS:", TAG_HUAWEI_NDIS_PORT);
+         cache_port_mode (plugin, response->str, "DIAG:", TAG_HUAWEI_DIAG_PORT);
+ 
+         g_object_set_data (G_OBJECT (plugin), TAG_GETPORTMODE_SUPPORTED, GUINT_TO_POINTER (1));
+@@ -294,6 +296,10 @@ grab_port (MMPluginBase *base,
+         pflags = MM_AT_PORT_FLAG_PRIMARY;
+     else if (usbif + 1 == GPOINTER_TO_INT (g_object_get_data (G_OBJECT (base), TAG_HUAWEI_MODEM_PORT)))
+         pflags = MM_AT_PORT_FLAG_PPP;
++    else if (!g_object_get_data (G_OBJECT (base), TAG_HUAWEI_MODEM_PORT) &&
++             usbif + 1 == GPOINTER_TO_INT (g_object_get_data (G_OBJECT (base), TAG_HUAWEI_NDIS_PORT)))
++        /* If NDIS reported only instead of MDM, use it */
++        pflags = MM_AT_PORT_FLAG_PPP;
+     else if (!g_object_get_data (G_OBJECT (base), TAG_GETPORTMODE_SUPPORTED)) {
+         /* If GETPORTMODE is not supported, we assume usbif 0 is the modem port */
+         if ((usbif == 0) && (ptype == MM_PORT_TYPE_AT)) {
+-- 
+1.7.10.4
+

=== added file 'debian/patches/git_via-plugin-has-vendor-product-string-probing-so-need_69fe9a8.patch'
--- debian/patches/git_via-plugin-has-vendor-product-string-probing-so-need_69fe9a8.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_via-plugin-has-vendor-product-string-probing-so-need_69fe9a8.patch	2012-11-08 16:29:20 +0000
@@ -0,0 +1,31 @@
+From 69fe9a8b3bae1a9b6d301c5d2e03df2f8271df47 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <[e-mail]>
+Date: Wed, 24 Oct 2012 10:11:32 +0200
+Subject: [PATCH 2/2] via: plugin has vendor/product string probing, so needs
+ to be sorted last
+
+The flag to get the plugin sorted last allows us to ensure that all plugins
+without vendor/product string probing (e.g. vendor/product ID probing) are run
+before. We don't want the Via plugin to start probing e.g. Huawei modems.
+
+In git master this flag in the plugin is not needed, it is automatically ordered
+last if vendor/product ID probing is set in the plugin.
+---
+ plugins/mm-plugin-via.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/mm-plugin-via.c b/plugins/mm-plugin-via.c
+index 841d8ec..6135b58 100644
+--- a/plugins/mm-plugin-via.c
++++ b/plugins/mm-plugin-via.c
+@@ -30,6 +30,7 @@ mm_plugin_create (void)
+ {
+     return MM_PLUGIN (g_object_new (MM_TYPE_PLUGIN_VIA,
+                                     MM_PLUGIN_BASE_NAME, "Via CBP7",
++                                    MM_PLUGIN_BASE_SORT_LAST, TRUE,
+                                     NULL));
+ }
+ 
+-- 
+1.7.10.4
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-09-25 20:51:14 +0000
+++ debian/patches/series	2012-11-08 16:29:20 +0000
@@ -1,4 +1,5 @@
 # patches for modemmanager
+0001-huawei-better-detection-of-data-port-on-some-modems.patch
 git_lte_4g_parsing_90489ae.patch
 git_lte_etsi_mode_0af47c7.patch
 git_better_handle_ucs2_convert_e07c216.patch