Fri Jun 7 00:17:01 PDT 2013

3 files changed, 131 insertions, 4 deletions

diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 5fc37eb52..bac735262 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187067 2013-06-03 11:16:48Z allan $
+# $Id: PKGBUILD 187841 2013-06-06 20:23:04Z tpowa $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -9,7 +9,7 @@
 pkgname=networkmanager
 _pkgname=NetworkManager
 pkgver=0.9.8.0
-pkgrel=4
+pkgrel=6
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -27,14 +27,20 @@ options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch)
+        NetworkManager.conf disable_set_hostname.patch
+        modem-manager-0.7.991-1.patch
+        modem-manager-0.7.991-2.patch)
 sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+            '0499a409aa53a57290ccecf52e2bfa0b81926261012d166f6d12a36edbbcfeff'
+            '570626b0bfd86a4ffc30f515ffffbb32f10ea69ae5825a3f015379e1a54066d8')
 
 prepare() {
   cd $_pkgname-$pkgver
   patch -Np1 -i ../disable_set_hostname.patch
+  patch -Np1 -i ../modem-manager-0.7.991-1.patch
+  patch -Np1 -i ../modem-manager-0.7.991-2.patch
 }
 
 build() {
diff --git a/extra/networkmanager/modem-manager-0.7.991-1.patch b/extra/networkmanager/modem-manager-0.7.991-1.patch
new file mode 100644
index 000000000..02ed33fdd
--- /dev/null
+++ b/extra/networkmanager/modem-manager-0.7.991-1.patch
@@ -0,0 +1,59 @@
+From 0ff869e1c76803348047150bb6a361f1fef9ef87 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander@lanedo.com>
+Date: Mon, 03 Jun 2013 10:21:25 +0000
+Subject: modem-manager: don't request allowed modes when talking to ModemManager1 modems
+
+Just let them get connected with whatever network type they currently have.
+---
+diff --git a/src/modem-manager/nm-modem-broadband.c b/src/modem-manager/nm-modem-broadband.c
+index 538b262..53839df 100644
+--- a/src/modem-manager/nm-modem-broadband.c
++++ b/src/modem-manager/nm-modem-broadband.c
+@@ -262,45 +262,6 @@ create_gsm_connect_properties (NMConnection *connection)
+ 	if (str)
+ 		mm_simple_connect_properties_set_password (properties, str);
+ 
+-	/* TODO: We should check SUPPORTED MODES here */
+-	switch (nm_setting_gsm_get_network_type (setting)) {
+-	case NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA:
+-		mm_simple_connect_properties_set_allowed_modes (properties,
+-		                                                MM_MODEM_MODE_3G,
+-		                                                MM_MODEM_MODE_NONE);
+-		break;
+-	case NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE:
+-		mm_simple_connect_properties_set_allowed_modes (properties,
+-		                                                MM_MODEM_MODE_2G,
+-		                                                MM_MODEM_MODE_NONE);
+-		break;
+-	case NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA:
+-		mm_simple_connect_properties_set_allowed_modes (properties,
+-		                                                MM_MODEM_MODE_ANY,
+-		                                                MM_MODEM_MODE_3G);
+-		break;
+-	case NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE:
+-		mm_simple_connect_properties_set_allowed_modes (properties,
+-		                                                MM_MODEM_MODE_ANY,
+-		                                                MM_MODEM_MODE_2G);
+-		break;
+-	case NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G:
+-		mm_simple_connect_properties_set_allowed_modes (properties,
+-		                                                MM_MODEM_MODE_ANY,
+-		                                                MM_MODEM_MODE_4G);
+-		break;
+-	case NM_SETTING_GSM_NETWORK_TYPE_4G:
+-		mm_simple_connect_properties_set_allowed_modes (properties,
+-		                                                MM_MODEM_MODE_4G,
+-		                                                MM_MODEM_MODE_NONE);
+-		break;
+-	default:
+-		mm_simple_connect_properties_set_allowed_modes (properties,
+-		                                                MM_MODEM_MODE_ANY,
+-		                                                MM_MODEM_MODE_NONE);
+-		break;
+-	}
+-
+ 	/* Roaming */
+ 	if (nm_setting_gsm_get_home_only (setting))
+ 		mm_simple_connect_properties_set_allow_roaming (properties, FALSE);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/networkmanager/modem-manager-0.7.991-2.patch b/extra/networkmanager/modem-manager-0.7.991-2.patch
new file mode 100644
index 000000000..f1ca11784
--- /dev/null
+++ b/extra/networkmanager/modem-manager-0.7.991-2.patch
@@ -0,0 +1,62 @@
+From c126d97cb6666c714d75dc68d808b34c77a99398 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander@lanedo.com>
+Date: Wed, 05 Jun 2013 14:34:10 +0000
+Subject: modem-manager: read 'SupportedCapabilities' instead of 'ModemCapabilities' (bgo #701668)
+
+There is no longer a 'ModemCapabilities' uint32 property; instead we have
+'SupportedCapabilities' giving a list of uint32 values. Just read the list and
+merge the values into a single mask; NM doesn't care about the exact
+combinations supported.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=701668
+---
+diff --git a/configure.ac b/configure.ac
+index d0ee1bd..e2e3862 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -464,7 +464,7 @@ AC_SUBST(PPPD_PLUGIN_DIR)
+ AC_ARG_WITH(modem-manager-1, AS_HELP_STRING([--with-modem-manager-1], [Enable new ModemManager1 interface support]),,[with_modem_manager_1=auto])
+ if (test "${with_modem_manager_1}" != "no"); then
+     PKG_CHECK_MODULES(MM_GLIB,
+-                      [mm-glib],
++                      [mm-glib >= 0.7.991],
+                       [have_libmm_glib=yes],
+                       [have_libmm_glib=no])
+     AC_SUBST(MM_GLIB_CFLAGS)
+@@ -782,4 +782,3 @@ echo "  documentation: $enable_gtk_doc"
+ echo "  tests: $enable_tests"
+ echo "  code coverage: $enable_code_coverage"
+ echo
+-
+diff --git a/src/modem-manager/nm-modem-broadband.c b/src/modem-manager/nm-modem-broadband.c
+index 53839df..febab8a 100644
+--- a/src/modem-manager/nm-modem-broadband.c
++++ b/src/modem-manager/nm-modem-broadband.c
+@@ -116,8 +116,23 @@ nm_modem_broadband_get_capabilities (NMModemBroadband *self,
+                                      NMDeviceModemCapabilities *modem_caps,
+                                      NMDeviceModemCapabilities *current_caps)
+ {
+-	*modem_caps = (NMDeviceModemCapabilities)mm_modem_get_modem_capabilities (self->priv->modem_iface);
+-	*current_caps = (NMDeviceModemCapabilities)mm_modem_get_current_capabilities (self->priv->modem_iface);
++	MMModemCapability all_supported = MM_MODEM_CAPABILITY_NONE;
++	MMModemCapability *supported;
++	guint n_supported;
++
++	/* For now, we don't care about the capability combinations, just merge all
++	 * combinations in a single mask */
++	if (mm_modem_get_supported_capabilities (self->priv->modem_iface, &supported, &n_supported)) {
++		guint i;
++
++		for (i = 0; i < n_supported; i++)
++			all_supported |= supported[i];
++
++		g_free (supported);
++	}
++
++	*modem_caps = (NMDeviceModemCapabilities) all_supported;
++	*current_caps = (NMDeviceModemCapabilities) mm_modem_get_current_capabilities (self->priv->modem_iface);
+ }
+ 
+ /*****************************************************************************/
+--
+cgit v0.9.0.2-2-gbebe