Apply upstream patch for crash on Wifi re-scan.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB1E955DB

4 files changed, 65 insertions, 11 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index c93af306db71..3fa117745f41 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.196 2014/05/31 20:39:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.197 2014/06/16 00:16:37 reavertm Exp $
+
+*networkmanager-0.9.8.10-r1 (16 Jun 2014)
+
+  16 Jun 2014; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch,
+  +networkmanager-0.9.8.10-r1.ebuild, -networkmanager-0.9.8.10.ebuild:
+  Apply upstream patch for crash on Wifi re-scan.
 
   31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
   networkmanager-0.9.8.10.ebuild, networkmanager-0.9.8.8.ebuild:
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index e4eff604850b..bd7380d61c43 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -22,23 +22,20 @@ AUX networkmanager-0.9.6.0-daemon-signals.patch 1045 SHA256 eb9e01f5622aabf611f8
 AUX networkmanager-0.9.7.995-pre-sleep.patch 4585 SHA256 d01d598846fccacbc5d4ddda8d31b6113c193bdbf2adbd72786d8385b9ae3d2a SHA512 d7e4b9a0dc934382e3fa3c49dcae0f9d5fb5eed39c67ca4f4a372acdfcd84beee4bbf7f9ce484f04b063cd0626d5c81ba69de1bdb3496746a0fff7a434864719 WHIRLPOOL 0d7f59fb2bbce67dce03e2286c294658e571cf57e1fc9915462a947def16ee695fc55e36abd171f491db9d23c184bdf5ea65e9e235cd5a76e7c0a656db800c52
 AUX networkmanager-0.9.8.2-allow-new-dhcpcd.patch 917 SHA256 b3a69fd9850634edc19a0db4d3ba5e8e3127c7aab518d3249e9b90420a98c667 SHA512 82aab846312f4932560b141c59fe2be75050879c1200a12391cca64fbcb62f7ccbb081eaf8a0b4af296c694c6936a48ede05303aef2b2566a23ca20770e31f85 WHIRLPOOL 105af5b1127ded7f121bcbaa41009f3d185c444f3541ce0af58c316c11f61a7c911205b399013015a0d12fb12fa876b6c7f055feb6482d99c982569bc2a8f253
 AUX networkmanager-0.9.8.4-pre-sleep.patch 4606 SHA256 ea70654524d5b414fcef10164b8dfb5e84bdf2444341f62fc7617952e2e721de SHA512 0781743f1e1afce3e51df6958996ea96885f56be96bd377dfbf115efaaa935396d468c701dd8a8c97e3a1623743476880e5936f4c0db4d560188e1f4c3b9b814 WHIRLPOOL 76dc1381cf0d7aa4d2d1530c077379929b40fcd54f66426ff46cca28d128fb40c88fd15bb6cb6139bec8c6bc338dbc8d266512056d27f307fa4e830cf28deb12
+AUX networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch 2015 SHA256 b883506591031ebda11beed149975137950449c0c17a4c3f06745c89d782256c SHA512 3435d9ab85df69e6cd8284a34bf689331d338d13a5d64d52abc36f4ffb5c3ba31aa4336560a7e0e082c58dd916ba4364dfb75246f1bd8c22c81aa195f4ff18a7 WHIRLPOOL eb9fbd2ff5471539dcfbb0cee8213ae479c191695f798a7475484c7061d636f5cb6e6be3eebbb74e0781481477002846d37957768e5b089c2b0bbc143f9d4991
 AUX nm-system-settings.conf-ifnet 70 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f SHA512 74304a367c0675cfc88a6ae17b291a9bc20f24a9dab72e9a4578e697870c4d96245aa45ce62ec86f1e5e7e3069ab8fccec33936e479ca630a836805addb5574d WHIRLPOOL 24e140440014c07c355cecab0564d6a57fc2e37e3ded242f3b9dd3e6ddd05dd924a7497400d2984eed407e99ba9661028a159dd4e393917cee7665b0ff4737eb
 DIST NetworkManager-0.9.6.4.tar.xz 1968564 SHA256 511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb SHA512 900eb30f7fed35d43f2c1003fcf7fc0b6ab9c5a9f0a14777d4636372376af8477e63fc7fc9b05d2f281d48de658d96d9b30f44851af8ae2b4271bb2b5c2cb669 WHIRLPOOL b87903e4cbb3efcec17b25e74dd67dc6a81a6d553df57e9c699bb1f0d40fe6d611953f6baaeca48ef4387316980d775ec2b07a9df06ecb5f03c10dffc2b60584
 DIST NetworkManager-0.9.8.10.tar.xz 2015492 SHA256 064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972 SHA512 8688b8dceadf87d26b76bdda76ecb0b383ecaa7991487e6f6ddc150cf311f2f0cb3487afd91f19ecde2925585e8d53c8761fd45743f25c488eff6a7811ca4200 WHIRLPOOL 29c4f2189eb812c23e8c1cfbce728c525282ad3f04d3c9c25b3a80a043c95f2a9419fa71ac6f8a59d7abde8a30275e68e3ef615b74f78c07846757d92f114e1c
 DIST NetworkManager-0.9.8.8.tar.xz 2026860 SHA256 8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55 SHA512 d65ab18642e7aff09d64ef97bb87324eb10955c71db5896d326f2f9acc340ae185b701405a441998555ac080c95ffafd32dfcbe8c8cca00ecffa64873d0bbd9f WHIRLPOOL 2d71561619003fbfdf9ef547e5ede49860fe891434be9948f50ed751b8ffbc961c87d804ea6676f5b2dad2ef5889f70afb05ce3ef374c8f47d1bba60931eae96
 EBUILD networkmanager-0.9.6.4.ebuild 7528 SHA256 d1beabae169c44e904b08349354c6f08951403b215078acf44182d18d18dc47a SHA512 4923345662ac03f50cad820d7d6fa43853559eb3a4f0f54255918cc0b39e6359a72f25aff2ead92ff7bb36943a494908d907f862e5c01e1c11ac808d4cc37b83 WHIRLPOOL 73048473fbe83b576f3abb9133b6b6dbd9a1aa2feea26ade80f87cfb7e26b5068b9fb4cc3384c1480d078153fc9f26f0fe0eb46dc08d9cd92a91370e8795daf7
-EBUILD networkmanager-0.9.8.10.ebuild 8299 SHA256 59c2fae837f04ed17efa18d56a39994c2561cfdec39081adae7e51198b2ef410 SHA512 1141deb7d6177d4007fb48d819e8c2ad3e2d16532c84f8ca51567cfaa72bbc1c1b9e6250a4b6614cb4e27d83287df49e96f9101c9936990b1ea0c51452e8395c WHIRLPOOL 82406745bc3b7908ebc0ed7a37caf26152c15fa991def2a5e745c8d05a92b505dee862f327430afe81ad19c3e96c68138c8616b22981d0596109bcc7d6205d96
+EBUILD networkmanager-0.9.8.10-r1.ebuild 8445 SHA256 136f5ae63cf243efee971b1ac5330015c1f2105b8861d57affdee9f098ecb6ff SHA512 4fb611fc6fb73d3481a129753696ce244e806e782ac1ac4ea08595c97b04329e3d54565faf8f24f4104ecffdee7c5b0004c0c2766007e480025374689c9652ca WHIRLPOOL eda046ca4571328df3fcd818ee0cad02a15977cec59ee2ea0fae6755dcabbd85976a3ddfaeb7e11f4c74cc45e46364e654398ee727b263892c5c12e80c87c065
 EBUILD networkmanager-0.9.8.8.ebuild 8297 SHA256 95d9d65c77ac8735e7182936ea077a0443fcc0e650c731e8da903c1c8ca1e63d SHA512 8cf0346ad4bbce6c66b6e411180fb79644be4e782765cdeff70e9f5749ddc8e91ec3cddb1f7af3cd37a066cb755e55e7d9e2b9b642c543aff5f6e2e159beaa41 WHIRLPOOL 0cb65f94e13788362e85c59c8faf1c2ba3144b10a74c36a2a1558be80a93816326bc94f522b583ce1bb010028cb84ca5292cb438516e156d59eaa3f1f896601e
-MISC ChangeLog 47995 SHA256 51ffc71cd4f4e1d78de0dd8c3c3879c77e4eabf571c1dca7d99a268888a4018a SHA512 6d6b54466b289c39ae4ae743b0057880b08f6c2981e1008ffbda8e44d5237ae98d8c74448a4d52aa0e928009a8f5a437522cf83e26e401f6e4833ff74fcc2843 WHIRLPOOL 849c9006f93684ef3fee678e462afdda1cd0b4b1c9758d72cebaa9870be9640b19144f747a00a792d5ec29d5b73d42e98655c7b46dcb606f7374bc3e56c1dbdf
+MISC ChangeLog 48277 SHA256 94e2670000cff70c9af1974f0167f5947d0f9d1af6f124b3126ed6e6ade1af00 SHA512 09c046fb60bddccf408f629dda0fea6d9a25057e6ad2feaafd65565166a1fb0aa7fa76ce46d1ef66e5968436e40362a5d49dfd75026dd963853a7bfe45d305a7 WHIRLPOOL 0b715e1d3a038725f6f1c229902fd871a617ecd137d864493efe385c8f753a29c2ba355c977e0e394529e627630c3a13317405ebd81103f96c6ead4285083338
 MISC metadata.xml 1432 SHA256 473cf4f4e96a9d2ba397bf2526ea54565ff8901e358e2e47fd395a27a00fa201 SHA512 1007fac4c7de320b942d41cc8ce04648077c7aaff2daf18423be86caa322e4dfae4ed009becbfb22e324de9d65e261bb9c410f240ec4700ffbeb8325c6181a62 WHIRLPOOL 52ae999e503fed880202a1d7af606ab3678f43e25496ce043a58d83a4db606e17e8c0375c60471baa38251a1e48077c030d4e023d5edcd846c69af82cfed504a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTij2kAAoJEEdUh39IaPFNDsoH/j/tWDhxjwMngRpFaq1NUyei
-Z+wJuz4KqPvZQxnRikdLZJdByyqXGmLjvDXn3qiBKEnvCmpCW9JWyaXaSmHJENw/
-SVsed0jdFhN50e+2Yc1XFKXQygqfVP7ECAUXsmG5BqTWSz9pw2lPrWMurvO6EnEY
-tfo9sNzqmLd38WAsmdal4wIS+R7xPWHCQtwZ6O5SQ+ZF6F/W5ukCbHulFD7tar6T
-WLSBqD/qWk0oC8IZoMxd4lKJba9XB+06FzjoNBztroeXu1RC1pp8CfTdKba9Kdyd
-PtgmHSH+32ow0DRZhUCkc0KoYVnIu9M/fVjNfNJ5RFEEr1IV1zYXZyqnE+ShRgE=
-=uSA9
+iEYEAREIAAYFAlOeN4AACgkQFuHa/bHpVdtZHQCeK7egYk8YMgtwDeFqu2y7Eprl
+BpoAniSaNRlhWDeBY06/d4yrC6+XlW3q
+=leUt
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch b/net-misc/networkmanager/files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch
new file mode 100644
index 000000000000..35e9c04aff4b
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch
@@ -0,0 +1,47 @@
+From 4099c9242b091604466dda081dc5f6909354258b Mon Sep 17 00:00:00 2001
+From: M. Vefa Bicakci <m.v.b@runbox.com>
+Date: Sat, 24 May 2014 23:37:00 +0000
+Subject: core: fix crash during Wi-Fi rescan by emitting NM_DEVICE_AUTH_REQUEST signal correctly
+
+Fixes regression introduced by commit da59b6d2229b85afbb9e14846931376340dc6030.
+
+https://mail.gnome.org/archives/networkmanager-list/2014-May/msg00038.html
+
+Backport-of: d9653484859c426f707b4759bc9882f7a57c1152
+[thaller@redhat.com: original patch modified in nm-device-wifi.c to pass no
+                     connection, as it is done on master]
+Signed-off-by: Thomas Haller <thaller@redhat.com>
+---
+diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
+index 8ca5278..052d68f 100644
+--- a/src/nm-device-wifi.c
++++ b/src/nm-device-wifi.c
+@@ -1563,6 +1563,7 @@ impl_device_request_scan (NMDeviceWifi *self,
+ 	g_signal_emit_by_name (device,
+ 	                       NM_DEVICE_AUTH_REQUEST,
+ 	                       context,
++	                       NULL,
+ 	                       NM_AUTH_PERMISSION_NETWORK_CONTROL,
+ 	                       TRUE,
+ 	                       request_scan_cb,
+diff --git a/src/nm-manager.c b/src/nm-manager.c
+index 9037e64..96bf3b4 100644
+--- a/src/nm-manager.c
++++ b/src/nm-manager.c
+@@ -1874,10 +1874,10 @@ device_auth_request_cb (NMDevice *device,
+ 	}
+ 
+ 	/* Ensure the subject has permissions for this connection */
+-	if (!nm_auth_uid_in_acl (connection,
+-	                         priv->session_monitor,
+-	                         sender_uid,
+-	                         &error_desc)) {
++	if (connection != NULL && !nm_auth_uid_in_acl (connection,
++	                                               priv->session_monitor,
++	                                               sender_uid,
++	                                               &error_desc)) {
+ 		error = g_error_new_literal (NM_MANAGER_ERROR,
+ 		                             NM_MANAGER_ERROR_PERMISSION_DENIED,
+ 		                             error_desc);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/networkmanager/networkmanager-0.9.8.10.ebuild b/net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild
index df933626ec62..1e0ac83035a2 100644
--- a/net-misc/networkmanager/networkmanager-0.9.8.10.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.10.ebuild,v 1.2 2014/05/31 20:39:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild,v 1.1 2014/06/16 00:16:37 reavertm Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="NetworkManager"
@@ -107,6 +107,9 @@ src_prepare() {
 	# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
 	epatch "${FILESDIR}/${PN}-0.9.8.4-pre-sleep.patch"
 
+	# https://www.mail-archive.com/networkmanager-list@gnome.org/msg24038.html
+	epatch "${FILESDIR}/${PN}-0.9.8.9-fix-crash-on-wifi-rescan.patch"
+
 	# Use python2.7 shebangs for test scripts
 	sed -e 's@\(^#!.*python\)@\12.7@' \
 		-i */tests/*.py || die