Date: Thursday, June 6, 2013 @ 22:14:52
Author: tpowa
Revision: 187840
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
networkmanager/repos/testing-i686/NetworkManager.conf
(from rev 187839, networkmanager/trunk/NetworkManager.conf)
networkmanager/repos/testing-i686/PKGBUILD
(from rev 187839, networkmanager/trunk/PKGBUILD)
networkmanager/repos/testing-i686/disable_set_hostname.patch
(from rev 187839, networkmanager/trunk/disable_set_hostname.patch)
networkmanager/repos/testing-i686/modem-manager-0.7.991-1.patch
(from rev 187839, networkmanager/trunk/modem-manager-0.7.991-1.patch)
networkmanager/repos/testing-i686/modem-manager-0.7.991-2.patch
(from rev 187839, networkmanager/trunk/modem-manager-0.7.991-2.patch)
networkmanager/repos/testing-i686/networkmanager.install
(from rev 187839, networkmanager/trunk/networkmanager.install)
networkmanager/repos/testing-x86_64/NetworkManager.conf
(from rev 187839, networkmanager/trunk/NetworkManager.conf)
networkmanager/repos/testing-x86_64/PKGBUILD
(from rev 187839, networkmanager/trunk/PKGBUILD)
networkmanager/repos/testing-x86_64/disable_set_hostname.patch
(from rev 187839, networkmanager/trunk/disable_set_hostname.patch)
networkmanager/repos/testing-x86_64/modem-manager-0.7.991-1.patch
(from rev 187839, networkmanager/trunk/modem-manager-0.7.991-1.patch)
networkmanager/repos/testing-x86_64/modem-manager-0.7.991-2.patch
(from rev 187839, networkmanager/trunk/modem-manager-0.7.991-2.patch)
networkmanager/repos/testing-x86_64/networkmanager.install
(from rev 187839, networkmanager/trunk/networkmanager.install)
Deleted:
networkmanager/repos/testing-i686/NetworkManager.conf
networkmanager/repos/testing-i686/PKGBUILD
networkmanager/repos/testing-i686/disable_set_hostname.patch
networkmanager/repos/testing-i686/networkmanager.install
networkmanager/repos/testing-x86_64/NetworkManager.conf
networkmanager/repos/testing-x86_64/PKGBUILD
networkmanager/repos/testing-x86_64/disable_set_hostname.patch
networkmanager/repos/testing-x86_64/networkmanager.install
----------------------------------------------+
/NetworkManager.conf | 4
/PKGBUILD | 156 +++++++++++++++++++++++++
/disable_set_hostname.patch | 38 ++++++
/networkmanager.install | 18 ++
testing-i686/NetworkManager.conf | 2
testing-i686/PKGBUILD | 74 -----------
testing-i686/disable_set_hostname.patch | 19 ---
testing-i686/modem-manager-0.7.991-1.patch | 59 +++++++++
testing-i686/modem-manager-0.7.991-2.patch | 62 +++++++++
testing-i686/networkmanager.install | 9 -
testing-x86_64/NetworkManager.conf | 2
testing-x86_64/PKGBUILD | 74 -----------
testing-x86_64/disable_set_hostname.patch | 19 ---
testing-x86_64/modem-manager-0.7.991-1.patch | 59 +++++++++
testing-x86_64/modem-manager-0.7.991-2.patch | 62 +++++++++
testing-x86_64/networkmanager.install | 9 -
16 files changed, 458 insertions(+), 208 deletions(-)
Deleted: testing-i686/NetworkManager.conf
===================================================================
--- testing-i686/NetworkManager.conf 2013-06-06 20:14:36 UTC (rev 187839)
+++ testing-i686/NetworkManager.conf 2013-06-06 20:14:52 UTC (rev 187840)
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
Copied: networkmanager/repos/testing-i686/NetworkManager.conf (from rev 187839,
networkmanager/trunk/NetworkManager.conf)
===================================================================
--- testing-i686/NetworkManager.conf (rev 0)
+++ testing-i686/NetworkManager.conf 2013-06-06 20:14:52 UTC (rev 187840)
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-06-06 20:14:36 UTC (rev 187839)
+++ testing-i686/PKGBUILD 2013-06-06 20:14:52 UTC (rev 187840)
@@ -1,74 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
-# Maintainer: Jan de Groot <j...@archlinxu.org>
-# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org>
-# Contributor: Tor Krill <t...@krill.nu>
-# Contributor: Will Rea <sillywi...@gmail.com>
-# Contributor: Valentine Sinitsyn <e_...@inbox.ru>
-
-pkgname=networkmanager
-_pkgname=NetworkManager
-pkgver=0.9.8.0
-pkgrel=5
-pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/$_pkgname/";
-depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
- libsoup systemd modemmanager)
-makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc)
-optdepends=('dhclient: DHCPv6 support'
- 'iptables: Connection sharing'
- 'dnsmasq: Connection sharing'
- 'bluez4: Bluetooth support'
- 'openresolv: resolvconf support'
- 'ppp: Dialup connection support')
-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)
-sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b'
- '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
- '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
-
-prepare() {
- cd $_pkgname-$pkgver
- patch -Np1 -i ../disable_set_hostname.patch
-}
-
-build() {
- cd $_pkgname-$pkgver
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/networkmanager \
- --sbindir=/usr/bin \
- --with-crypto=nss \
- --with-dhclient=/usr/bin/dhclient \
- --with-dhcpcd=/usr/bin/dhcpcd \
- --with-iptables=/usr/bin/iptables \
- --with-systemdsystemunitdir=/usr/lib/systemd/system \
- --with-udev-dir=/usr/lib/udev \
- --with-resolvconf=/usr/bin/resolvconf \
- --with-session-tracking=systemd \
- --with-modem-manager-1 \
- --disable-static \
- --enable-more-warnings=no \
- --disable-wimax \
- --enable-modify-system \
- --enable-doc
-
- make
-}
-
-package() {
- cd $_pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
- install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
-
- rm -r "$pkgdir/var/run"
-}
Copied: networkmanager/repos/testing-i686/PKGBUILD (from rev 187839,
networkmanager/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-06-06 20:14:52 UTC (rev 187840)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Maintainer: Jan de Groot <j...@archlinxu.org>
+# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org>
+# Contributor: Tor Krill <t...@krill.nu>
+# Contributor: Will Rea <sillywi...@gmail.com>
+# Contributor: Valentine Sinitsyn <e_...@inbox.ru>
+
+pkgname=networkmanager
+_pkgname=NetworkManager
+pkgver=0.9.8.0
+pkgrel=7
+pkgdesc="Network Management daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/$_pkgname/";
+depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
+ libsoup systemd modemmanager)
+makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc)
+optdepends=('dhclient: DHCPv6 support'
+ 'dnsmasq: Connection sharing'
+ 'bluez4: Bluetooth support'
+ 'openresolv: resolvconf support'
+ 'ppp: Dialup connection support')
+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
+ modem-manager-0.7.991-1.patch
+ modem-manager-0.7.991-2.patch)
+sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b'
+ '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
+ '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() {
+ cd $_pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/networkmanager \
+ --sbindir=/usr/bin \
+ --with-crypto=nss \
+ --with-dhclient=/usr/bin/dhclient \
+ --with-dhcpcd=/usr/bin/dhcpcd \
+ --with-iptables=/usr/bin/iptables \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --with-udev-dir=/usr/lib/udev \
+ --with-resolvconf=/usr/bin/resolvconf \
+ --with-session-tracking=systemd \
+ --with-modem-manager-1 \
+ --disable-static \
+ --enable-more-warnings=no \
+ --disable-wimax \
+ --enable-modify-system \
+ --enable-doc
+
+ make
+}
+
+package() {
+ cd $_pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+ install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+ rm -r "$pkgdir/var/run"
+}
Deleted: testing-i686/disable_set_hostname.patch
===================================================================
--- testing-i686/disable_set_hostname.patch 2013-06-06 20:14:36 UTC (rev
187839)
+++ testing-i686/disable_set_hostname.patch 2013-06-06 20:14:52 UTC (rev
187840)
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c
NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450
+0000
-+++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737
+0000
-@@ -302,6 +302,7 @@
- return;
- }
-
-+#if 0
- /* Try automatically determined hostname from the best device's IP
config */
- if (!best4)
- best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- }
- }
-
-+#endif
- /* If no automatically-configured hostname, try using the hostname from
- * when NM started up.
- */
Copied: networkmanager/repos/testing-i686/disable_set_hostname.patch (from rev
187839, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- testing-i686/disable_set_hostname.patch (rev 0)
+++ testing-i686/disable_set_hostname.patch 2013-06-06 20:14:52 UTC (rev
187840)
@@ -0,0 +1,19 @@
+diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c
NetworkManager-0.9.0/src/nm-policy.c
+--- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450
+0000
++++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737
+0000
+@@ -302,6 +302,7 @@
+ return;
+ }
+
++#if 0
+ /* Try automatically determined hostname from the best device's IP
config */
+ if (!best4)
+ best4 = get_best_ip4_device (policy->manager, &best_req4);
+@@ -356,6 +357,7 @@
+ }
+ }
+
++#endif
+ /* If no automatically-configured hostname, try using the hostname from
+ * when NM started up.
+ */
Copied: networkmanager/repos/testing-i686/modem-manager-0.7.991-1.patch (from
rev 187839, networkmanager/trunk/modem-manager-0.7.991-1.patch)
===================================================================
--- testing-i686/modem-manager-0.7.991-1.patch (rev 0)
+++ testing-i686/modem-manager-0.7.991-1.patch 2013-06-06 20:14:52 UTC (rev
187840)
@@ -0,0 +1,59 @@
+From 0ff869e1c76803348047150bb6a361f1fef9ef87 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksan...@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
Copied: networkmanager/repos/testing-i686/modem-manager-0.7.991-2.patch (from
rev 187839, networkmanager/trunk/modem-manager-0.7.991-2.patch)
===================================================================
--- testing-i686/modem-manager-0.7.991-2.patch (rev 0)
+++ testing-i686/modem-manager-0.7.991-2.patch 2013-06-06 20:14:52 UTC (rev
187840)
@@ -0,0 +1,62 @@
+From c126d97cb6666c714d75dc68d808b34c77a99398 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksan...@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
Deleted: testing-i686/networkmanager.install
===================================================================
--- testing-i686/networkmanager.install 2013-06-06 20:14:36 UTC (rev 187839)
+++ testing-i686/networkmanager.install 2013-06-06 20:14:52 UTC (rev 187840)
@@ -1,9 +0,0 @@
-post_upgrade() {
- (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
-ATTENTION:
- /etc/NetworkManager/nm-system-settings.conf has been replaced
- by /etc/NetworkManager/NetworkManager.conf. Make sure you move
- any custom settings to the new config file.
-MSG
- true
-}
Copied: networkmanager/repos/testing-i686/networkmanager.install (from rev
187839, networkmanager/trunk/networkmanager.install)
===================================================================
--- testing-i686/networkmanager.install (rev 0)
+++ testing-i686/networkmanager.install 2013-06-06 20:14:52 UTC (rev 187840)
@@ -0,0 +1,9 @@
+post_upgrade() {
+ (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
+ATTENTION:
+ /etc/NetworkManager/nm-system-settings.conf has been replaced
+ by /etc/NetworkManager/NetworkManager.conf. Make sure you move
+ any custom settings to the new config file.
+MSG
+ true
+}
Deleted: testing-x86_64/NetworkManager.conf
===================================================================
--- testing-x86_64/NetworkManager.conf 2013-06-06 20:14:36 UTC (rev 187839)
+++ testing-x86_64/NetworkManager.conf 2013-06-06 20:14:52 UTC (rev 187840)
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
Copied: networkmanager/repos/testing-x86_64/NetworkManager.conf (from rev
187839, networkmanager/trunk/NetworkManager.conf)
===================================================================
--- testing-x86_64/NetworkManager.conf (rev 0)
+++ testing-x86_64/NetworkManager.conf 2013-06-06 20:14:52 UTC (rev 187840)
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-06-06 20:14:36 UTC (rev 187839)
+++ testing-x86_64/PKGBUILD 2013-06-06 20:14:52 UTC (rev 187840)
@@ -1,74 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
-# Maintainer: Jan de Groot <j...@archlinxu.org>
-# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org>
-# Contributor: Tor Krill <t...@krill.nu>
-# Contributor: Will Rea <sillywi...@gmail.com>
-# Contributor: Valentine Sinitsyn <e_...@inbox.ru>
-
-pkgname=networkmanager
-_pkgname=NetworkManager
-pkgver=0.9.8.0
-pkgrel=5
-pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/$_pkgname/";
-depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
- libsoup systemd modemmanager)
-makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc)
-optdepends=('dhclient: DHCPv6 support'
- 'iptables: Connection sharing'
- 'dnsmasq: Connection sharing'
- 'bluez4: Bluetooth support'
- 'openresolv: resolvconf support'
- 'ppp: Dialup connection support')
-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)
-sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b'
- '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
- '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
-
-prepare() {
- cd $_pkgname-$pkgver
- patch -Np1 -i ../disable_set_hostname.patch
-}
-
-build() {
- cd $_pkgname-$pkgver
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/networkmanager \
- --sbindir=/usr/bin \
- --with-crypto=nss \
- --with-dhclient=/usr/bin/dhclient \
- --with-dhcpcd=/usr/bin/dhcpcd \
- --with-iptables=/usr/bin/iptables \
- --with-systemdsystemunitdir=/usr/lib/systemd/system \
- --with-udev-dir=/usr/lib/udev \
- --with-resolvconf=/usr/bin/resolvconf \
- --with-session-tracking=systemd \
- --with-modem-manager-1 \
- --disable-static \
- --enable-more-warnings=no \
- --disable-wimax \
- --enable-modify-system \
- --enable-doc
-
- make
-}
-
-package() {
- cd $_pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
- install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
-
- rm -r "$pkgdir/var/run"
-}
Copied: networkmanager/repos/testing-x86_64/PKGBUILD (from rev 187839,
networkmanager/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2013-06-06 20:14:52 UTC (rev 187840)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Maintainer: Jan de Groot <j...@archlinxu.org>
+# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org>
+# Contributor: Tor Krill <t...@krill.nu>
+# Contributor: Will Rea <sillywi...@gmail.com>
+# Contributor: Valentine Sinitsyn <e_...@inbox.ru>
+
+pkgname=networkmanager
+_pkgname=NetworkManager
+pkgver=0.9.8.0
+pkgrel=7
+pkgdesc="Network Management daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org/projects/$_pkgname/";
+depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
+ libsoup systemd modemmanager)
+makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc)
+optdepends=('dhclient: DHCPv6 support'
+ 'dnsmasq: Connection sharing'
+ 'bluez4: Bluetooth support'
+ 'openresolv: resolvconf support'
+ 'ppp: Dialup connection support')
+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
+ modem-manager-0.7.991-1.patch
+ modem-manager-0.7.991-2.patch)
+sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b'
+ '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
+ '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() {
+ cd $_pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/networkmanager \
+ --sbindir=/usr/bin \
+ --with-crypto=nss \
+ --with-dhclient=/usr/bin/dhclient \
+ --with-dhcpcd=/usr/bin/dhcpcd \
+ --with-iptables=/usr/bin/iptables \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system \
+ --with-udev-dir=/usr/lib/udev \
+ --with-resolvconf=/usr/bin/resolvconf \
+ --with-session-tracking=systemd \
+ --with-modem-manager-1 \
+ --disable-static \
+ --enable-more-warnings=no \
+ --disable-wimax \
+ --enable-modify-system \
+ --enable-doc
+
+ make
+}
+
+package() {
+ cd $_pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+ install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
+
+ rm -r "$pkgdir/var/run"
+}
Deleted: testing-x86_64/disable_set_hostname.patch
===================================================================
--- testing-x86_64/disable_set_hostname.patch 2013-06-06 20:14:36 UTC (rev
187839)
+++ testing-x86_64/disable_set_hostname.patch 2013-06-06 20:14:52 UTC (rev
187840)
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c
NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450
+0000
-+++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737
+0000
-@@ -302,6 +302,7 @@
- return;
- }
-
-+#if 0
- /* Try automatically determined hostname from the best device's IP
config */
- if (!best4)
- best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- }
- }
-
-+#endif
- /* If no automatically-configured hostname, try using the hostname from
- * when NM started up.
- */
Copied: networkmanager/repos/testing-x86_64/disable_set_hostname.patch (from
rev 187839, networkmanager/trunk/disable_set_hostname.patch)
===================================================================
--- testing-x86_64/disable_set_hostname.patch (rev 0)
+++ testing-x86_64/disable_set_hostname.patch 2013-06-06 20:14:52 UTC (rev
187840)
@@ -0,0 +1,19 @@
+diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c
NetworkManager-0.9.0/src/nm-policy.c
+--- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450
+0000
++++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737
+0000
+@@ -302,6 +302,7 @@
+ return;
+ }
+
++#if 0
+ /* Try automatically determined hostname from the best device's IP
config */
+ if (!best4)
+ best4 = get_best_ip4_device (policy->manager, &best_req4);
+@@ -356,6 +357,7 @@
+ }
+ }
+
++#endif
+ /* If no automatically-configured hostname, try using the hostname from
+ * when NM started up.
+ */
Copied: networkmanager/repos/testing-x86_64/modem-manager-0.7.991-1.patch (from
rev 187839, networkmanager/trunk/modem-manager-0.7.991-1.patch)
===================================================================
--- testing-x86_64/modem-manager-0.7.991-1.patch
(rev 0)
+++ testing-x86_64/modem-manager-0.7.991-1.patch 2013-06-06 20:14:52 UTC
(rev 187840)
@@ -0,0 +1,59 @@
+From 0ff869e1c76803348047150bb6a361f1fef9ef87 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksan...@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
Copied: networkmanager/repos/testing-x86_64/modem-manager-0.7.991-2.patch (from
rev 187839, networkmanager/trunk/modem-manager-0.7.991-2.patch)
===================================================================
--- testing-x86_64/modem-manager-0.7.991-2.patch
(rev 0)
+++ testing-x86_64/modem-manager-0.7.991-2.patch 2013-06-06 20:14:52 UTC
(rev 187840)
@@ -0,0 +1,62 @@
+From c126d97cb6666c714d75dc68d808b34c77a99398 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksan...@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
Deleted: testing-x86_64/networkmanager.install
===================================================================
--- testing-x86_64/networkmanager.install 2013-06-06 20:14:36 UTC (rev
187839)
+++ testing-x86_64/networkmanager.install 2013-06-06 20:14:52 UTC (rev
187840)
@@ -1,9 +0,0 @@
-post_upgrade() {
- (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
-ATTENTION:
- /etc/NetworkManager/nm-system-settings.conf has been replaced
- by /etc/NetworkManager/NetworkManager.conf. Make sure you move
- any custom settings to the new config file.
-MSG
- true
-}
Copied: networkmanager/repos/testing-x86_64/networkmanager.install (from rev
187839, networkmanager/trunk/networkmanager.install)
===================================================================
--- testing-x86_64/networkmanager.install (rev 0)
+++ testing-x86_64/networkmanager.install 2013-06-06 20:14:52 UTC (rev
187840)
@@ -0,0 +1,9 @@
+post_upgrade() {
+ (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
+ATTENTION:
+ /etc/NetworkManager/nm-system-settings.conf has been replaced
+ by /etc/NetworkManager/NetworkManager.conf. Make sure you move
+ any custom settings to the new config file.
+MSG
+ true
+}
