wifi: hack for wext devices reporting IW_MODE_AUTO configuration mode (rh #1325631)

rh #1261428, rh #1264676, rh #1263959, rh #1265993, rh #1266003, rh #1272974

.gitignore

@@ -319,3 +319,6 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.0.4.git20150713.38bf2cb0.tar.bz2
 /NetworkManager-1.0.4.tar.xz
 /NetworkManager-1.0.6.tar.xz
+/NetworkManager-1.0.8.tar.xz
+/NetworkManager-1.0.10.tar.xz
+/NetworkManager-1.0.12.tar.xz

0001-config-bugfix-parse-commandline-options-into-correct.patch

@@ -1,36 +0,0 @@
-From 8a22a98157f7f6773f3d1f295419569c6c880a47 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <u.oelmann@pengutronix.de>
-Date: Thu, 27 Aug 2015 22:18:55 +0200
-Subject: [PATCH] config: bugfix: parse commandline options into correct object
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Config related commandline options should be parsed into a function argument but
-were instead parsed into an object with local scope. As a result none of them
-had any impact.
-
-Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
-
-Fixes: b4ad7434a87c165a77b615accbe1868a9df9221b
-
-https://mail.gnome.org/archives/networkmanager-list/2015-August/msg00033.html
----
- src/main.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/main.c b/src/main.c
-index 495262e..a9bc479 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -246,7 +246,6 @@ do_early_setup (int *argc, char **argv[], NMConfigCmdLineOptions *config_cli)
- 		{NULL}
- 	};
- 
--	config_cli = nm_config_cmd_line_options_new ();
- 	if (!nm_main_utils_early_setup ("NetworkManager",
- 	                                argc,
- 	                                argv,
--- 
-2.4.3
-

0001-wifi-hack-for-wext-devices.patch

@@ -0,0 +1,27 @@
+From 70c0defe753bc98ac75725cc32a84b36f32258e4 Mon Sep 17 00:00:00 2001
+From: Francesco Giudici <fgiudici@redhat.com>
+Date: Fri, 11 Mar 2016 09:55:39 +0100
+Subject: [PATCH] wifi: hack for wext devices reporting IW_MODE_AUTO
+ configuration mode.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=763388
+(cherry picked from commit 0f6febc6fbeafde62e6e0a8c12f57204d94166fb)
+---
+ src/platform/wifi/wifi-utils-wext.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c
+index 470b73d..14a16ec 100644
+--- a/src/platform/wifi/wifi-utils-wext.c
++++ b/src/platform/wifi/wifi-utils-wext.c
+@@ -122,6 +122,7 @@ wifi_wext_get_mode (WifiData *data)
+ 	case IW_MODE_MASTER:
+ 		return NM_802_11_MODE_AP;
+ 	case IW_MODE_INFRA:
++	case IW_MODE_AUTO: /* hack for WEXT devices reporting IW_MODE_AUTO */
+ 		return NM_802_11_MODE_INFRA;
+ 	default:
+ 		break;
+-- 
+2.5.5
+

NetworkManager.spec

@@ -9,7 +9,7 @@
 
 %define snapshot %{nil}
 %define release_version 2
-%define realversion 1.0.6
+%define realversion 1.0.12
 %define epoch_version 1
 
 %define obsoletes_nmver 1:0.9.9.95-1
@@ -77,7 +77,7 @@ Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
-Source: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/%{name}-%{realversion}.tar.xz
+Source: https://download.gnome.org/sources/NetworkManager/1.0/%{name}-%{realversion}.tar.xz
 Source1: NetworkManager.conf
 Source2: 00-server.conf
 Source3: 10-ibft-plugin.conf
@@ -86,8 +86,8 @@ Source4: 20-connectivity-fedora.conf
 # Not upstream.
 Patch0: 0000-explain-dns1-dns2.patch
 
-# nm-1-0 backports
-Patch1: 0001-config-bugfix-parse-commandline-options-into-correct.patch
+# Not released upstream yet.
+Patch1: 0001-wifi-hack-for-wext-devices.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -130,7 +130,6 @@ BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= 0.10.3
 BuildRequires: gettext-devel
-BuildRequires: /usr/bin/autopoint
 BuildRequires: pkgconfig
 BuildRequires: libnl3-devel >= %{libnl3_version}
 BuildRequires: perl(XML::Parser)
@@ -375,9 +374,8 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 %{__cp} -R docs ORIG-docs
 %endif
 
-autoreconf -f -i
-autopoint --force
-intltoolize --force
+autoreconf --install --force
+intltoolize --automake --copy --force
 %configure \
 	--disable-static \
 	--with-dhclient=yes \
@@ -611,6 +609,7 @@ fi
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/%{name}.h
 %{_includedir}/%{name}/NetworkManagerVPN.h
+%{_includedir}/%{name}/nm-version-macros.h
 %{_includedir}/%{name}/nm-version.h
 %{_libdir}/pkgconfig/%{name}.pc
 %dir %{_datadir}/gtk-doc/html/NetworkManager
@@ -684,6 +683,52 @@ fi
 %endif
 
 %changelog
+* Wed Apr 13 2016 Francesco Giudici <fgiudici@redhat.com> - 1:1.0.12-2
+- wifi: hack for wext devices reporting IW_MODE_AUTO configuration mode (rh #1325631)
+
+* Sat Apr  2 2016 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.12-1
+- Update to 1.0.12 release
+
+* Wed Mar  2 2016 Thomas Haller <thaller@redhat.com> - 1:1.0.10-3
+- wifi: avoid crash when reusing supplicant instance (rh #1298007, rh #1241198)
+
+* Tue Jan  5 2016 Thomas Haller <thaller@redhat.com> - 1:1.0.10-2
+- routes: fix handling device-routes for IPv4 peer-addresses (rh #1294309)
+
+* Wed Dec 23 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.10-1
+- Update to 1.0.10 release
+
+* Mon Nov 23 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.8-1
+- Update to 1.0.8 release
+
+* Thu Nov  5 2015 Jiří Klimeš <jklimes@redhat.com> - 1:1.0.6-8
+- vpn: increase vpn service timeout to 180 seconds (rh #1277693) 
+- policy: fix looping through list while removing elements (rh #1175446)
+
+* Mon Oct 19 2015 Jiří Klimeš <jklimes@redhat.com> - 1:1.0.6-7
+- libnm-core: fix a crash in priority_strv_to_maplist()
+- core: fix handling ignore-auto-dns for IPv6 nameservers (rh #1261428)
+- manager: disconnect signal handlers on 'settings' in dispose() (rh #1264676)
+- modem-broadband: update modem's supported-ip-families (rh #1263959)
+- cli: allow 'ipv6' and 'ppp' settings for GSM and CDMA connections (rh #1265993)
+- wifi: fix a crash in on_bss_proxy_acquired() (rh #1266003)
+- tui: fix crash during activation when failed to create secret-agent (bgo #755883)
+- libnm: specify (transfer none) introspection annotation (bgo #756380)
+- platform: fix link-detection for s390 CTC-type devices (rh #1272974)
+
+* Mon Sep 28 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.6-6
+- Fix the VPN MTU setup (rh #1244547)
+
+* Tue Sep 15 2015 Jiří Klimeš <jklimes@redhat.com> - 1:1.0.6-5
+- nmcli: allow adding 'generic' connections via 'nmcli con add' (rh #1263185)
+
+* Tue Sep  8 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.6-4
+- Fix build & test with newer glib
+- Actually apply patch forgotten in a previous release
+
+* Tue Sep  8 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.6-3
+- Fix the tunelled VPN route setup
+
 * Fri Aug 28 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.6-2
 - Fix command line parsing
 

sources

@@ -1 +1 @@
-00f5f9ec69725a9f9b99366853c6f73e  NetworkManager-1.0.6.tar.xz
+ebb273456a81ccf9dfaf2461061b0e96  NetworkManager-1.0.12.tar.xz