fix typo in changelog

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

.gitignore

@@ -319,3 +319,5 @@ 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

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-rh1294309-peer-device-route.patch

@@ -0,0 +1,55 @@
+From 01ec441715e24ce43394fe7aad34501ef538386e Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Mon, 4 Jan 2016 18:54:26 +0100
+Subject: [PATCH 1/1] core: fix failure to configure routes due to wrong
+ device-route for IPv4 peer-addresses
+
+As in the case of a OpenVPN connection, we might add an address like:
+  10.8.0.58/32 ptp 10.8.0.57
+
+In this case, kernel would automatically add a device-route like:
+  10.8.0.57/32 via 0.0.0.0 dev 32 metric 0 mss 0 src rtprot-kernel scope link pref-src 10.8.0.58
+
+nm_ip4_config_commit() checks all IP addresses to figure out
+the present device-routes. Then the routes are synced by NMRouteManager.
+Due to a bug, we would not consider the peer-address, but the local-address
+and configure a route 10.8.0.58/32, instead of 10.8.0.57/32.
+
+That stays mostly unnoticed, because usually the peer and the local-address are
+in the same subnet, so that there is no difference (/32 is an example of the
+peer-address being in a different subnet).
+
+It also seems that due to a bug fixed by df4e5357521 this issue didn't surface.
+Probably because we would not notice the 10.8.0.57/32 right away and thus
+nm_route_manager_ip4_route_sync() would not wrongly delete it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759892
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809195
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809494
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809526
+https://bugs.archlinux.org/task/47535
+https://bugzilla.redhat.com/show_bug.cgi?id=1294309
+https://mail.gnome.org/archives/networkmanager-list/2015-December/msg00059.html
+(cherry picked from commit 11aa07ed939193e85516c287a57dee1837242972)
+---
+ src/nm-ip4-config.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
+index f625d35..61e29af 100644
+--- a/src/nm-ip4-config.c
++++ b/src/nm-ip4-config.c
+@@ -298,7 +298,8 @@ nm_ip4_config_commit (const NMIP4Config *config, int ifindex, gboolean routes_fu
+ 
+ 				route.ifindex = ifindex;
+ 				route.source = NM_IP_CONFIG_SOURCE_KERNEL;
+-				route.network = nm_utils_ip4_address_clear_host_address (addr->address, addr->plen);
++				route.network = nm_utils_ip4_address_clear_host_address (addr->peer_address ? : addr->address,
++				                                                         addr->plen);
+ 				route.plen = addr->plen;
+ 				route.pref_src = addr->address;
+ 				route.metric = default_route_metric;
+-- 
+2.5.0
+

0002-wifi-avoid-crash-reusing-supplicant-rh1298007.patch

@@ -0,0 +1,42 @@
+From dd8ee9be472ddf799e63e035bf0c82f072dc1881 Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Thu, 21 Jan 2016 15:03:44 +0100
+Subject: [PATCH 1/1] wifi: assert against returning cached
+ NMSupplicantInterface instances
+
+nm_supplicant_manager_iface_get() returning a cached instance leads to
+a crash when the first owner releases the object, as no ownership is
+transferred.
+
+That was fixed on master by commit f1fba3eb02c5d102a1b0e85c371dce81e5bd0d3b.
+Instead of backporting the entire refactoring (which also asserts against
+reuse), just disallow reusing here.
+
+The assertion should not be hit. If it would we need to investigate.
+Also, this way the assertion avoids a hard crash.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1298007
+(cherry picked from commit bd27102277e5d7e52d87bd26711ae6c431e08192)
+---
+ src/supplicant-manager/nm-supplicant-manager.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c
+index 083f2eb..e31e726 100644
+--- a/src/supplicant-manager/nm-supplicant-manager.c
++++ b/src/supplicant-manager/nm-supplicant-manager.c
+@@ -93,7 +93,10 @@ nm_supplicant_manager_iface_get (NMSupplicantManager * self,
+ 			                     iface);
+ 		}
+ 	} else {
+-		nm_log_dbg (LOGD_SUPPLICANT, "(%s): returning existing supplicant interface", ifname);
++		/* nm_supplicant_manager_iface_get() and release() implements no form of ref-counting
++		 * to properly handle reusing a cached instance. It's also unclear whether that is
++		 * even necessary or desired. Assert here and error out (rh #1298007). */
++		g_return_val_if_reached (NULL);
+ 	}
+ 
+ 	return iface;
+-- 
+2.5.0
+

NetworkManager.spec

@@ -8,8 +8,8 @@
 %define ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad)
 
 %define snapshot %{nil}
-%define release_version 2
-%define realversion 1.0.6
+%define release_version 3
+%define realversion 1.0.10
 %define epoch_version 1
 
 %define obsoletes_nmver 1:0.9.9.95-1
@@ -87,7 +87,8 @@ Source4: 20-connectivity-fedora.conf
 Patch0: 0000-explain-dns1-dns2.patch
 
 # nm-1-0 backports
-Patch1: 0001-config-bugfix-parse-commandline-options-into-correct.patch
+Patch1: 0001-rh1294309-peer-device-route.patch
+Patch2: 0002-wifi-avoid-crash-reusing-supplicant-rh1298007.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -130,7 +131,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)
@@ -366,6 +366,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 %setup -q -n NetworkManager-%{realversion}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -375,9 +376,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 +611,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 +685,46 @@ fi
 %endif
 
 %changelog
+* 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
+a8f54460a4708efd840358f32d0968fd  NetworkManager-1.0.10.tar.xz