Another small patch. That should stop crashes described in bug #333257

4 files changed, 41 insertions, 2 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 490fe9d..14270cf 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.47 2009/06/10 22:03:19 dagger Exp $
 
+*networkmanager-0.8.1-r5 (18 Aug 2010)
+
+  18 Aug 2010; Robert Piasek <dagger@gentoo.org>
+  -networkmanager-0.8.1-r4.ebuild, +networkmanager-0.8.1-r5.ebuild,
+  +files/networkmanager-0.8.1-fix-ifnet2.patch:
+  Another small patch. That should stop crashes described in bug #333257
+
 *networkmanager-0.8.1-r4 (18 Aug 2010)
 
   18 Aug 2010; Robert Piasek <dagger@gentoo.org>
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 3e33b0d..48c9091 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,10 +3,11 @@ AUX networkmanager-0.8.1-confchanges.patch 1145 RMD160 c540696830e311cc9941e5565
 AUX networkmanager-0.8.1-dhclient3.patch 4658 RMD160 d229c87a41f882a6162520ee3f2afdc5650c283a SHA1 06ca671ba76cd1591556cdcc96a88060ca89e727 SHA256 45b1c302cea8605cc489a77250404e4457d0747ca3cab9ed993eb51551da3290
 AUX networkmanager-0.8.1-dhcp-configure.patch 2447 RMD160 1c222ce867a7f92167b2ffcbc401f8ea83b24193 SHA1 f17b676ad65788b5b665c16b29d01a88e3cdd041 SHA256 7bda5db2d937b2562c98435620774bba487bf8b53da5c035422b2bc2ed21a400
 AUX networkmanager-0.8.1-fix-ifnet1.patch 12412 RMD160 9a1d7aac38e5ad6ea05cfd3f2b630a2441ed8d24 SHA1 70f4a874a3c7df88496fc178b6b1486de118cd0a SHA256 d586edbdca90a7ae6a667497d6edf87cd94fb49a20f69df8b8f3bba349dab12e
+AUX networkmanager-0.8.1-fix-ifnet2.patch 1080 RMD160 74b692605e05bb228b5e9cbf9aa26a0c51e3427b SHA1 262aa922872876c6bdafdf2f46bf53e6dce33cf2 SHA256 023bfa5f900347bb9391752c6229badd43a77fd1d5b4c0a5fa1833739e1b111f
 AUX networkmanager-0.8.1-glib-2.25.12-workaround.patch 663 RMD160 b4397b17a6148244dedd341b35185c07ca267f06 SHA1 926acbd76076750ab4ec48ac34fe73679693a4ca SHA256 a00523ad7d6bdced76be82b980788af4c313fc59aff8b9d258343e17ad6bf969
 AUX nm-system-settings.conf 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
 DIST NetworkManager-0.8.1.tar.bz2 1505134 RMD160 82f5ad1a641fa49acf34604f89154c865f3d5fbc SHA1 778989ed73cfd7ec05714f77121fa8bfc1bf0981 SHA256 dc126fbe3199d47899c4781e4fff32cee404dc7c728c6ade9eaa899bd80f19fa
 DIST networkmanager-ifnet-308267b4.patch 263345 RMD160 ceefeacea0c2e6cedb4ded62b9628173c0a7c7db SHA1 1249e86d9ba1769160a8dcf8a2482c5f93f0fe63 SHA256 60b5d9a3604fd093d4cff2be806500bcaa59e1d69848aeea9d4f9f8aed26a11c
-EBUILD networkmanager-0.8.1-r4.ebuild 3757 RMD160 9230ed90f403de4656231f5b3deb379544555d3f SHA1 2697e571030a4ead313248c066bb9b23d7aa927f SHA256 722964e2d7a906ad1853469eecb34a7bdc7b10cb4d65065ed09d91091b8f7dfd
-MISC ChangeLog 12957 RMD160 2cfbcb3bff148dbf830d47a0c98bdf0114240f95 SHA1 28dedd12700325ad722db3d9cff06f800c486de0 SHA256 9cfe21d2b955903466150bffdb292293b3fe6f1320f170590e38873d31891dab
+EBUILD networkmanager-0.8.1-r5.ebuild 3801 RMD160 f965ac7faf7ee7dcb9829a3810611e2c750fe622 SHA1 494a51eeb10c7ed7014467e3f5ad45a1df76b6e6 SHA256 c03b5dc2816069fcc1c66cb47a665c9a28766ac4eecb93bbfe770856cb53b3a8
+MISC ChangeLog 13236 RMD160 bd04211302086d4411a0aa96f5ac577939c0a001 SHA1 c22810ce3a89123c01dfaedf0b0175c9e472a546 SHA256 7e6e0e4af60092353e2b42fb0392b81d6021e07366ee994cc1072f16e203d398
 MISC metadata.xml 969 RMD160 c16683ef7fed4b5603029ae39f5872032ec37554 SHA1 813e0b48a78ce50d5257030507d22fd0e9452161 SHA256 e4375eae4ff0d47386780e4d29575e6581f7c9b89168372bb1bb7713a452c02f
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.1-fix-ifnet2.patch b/net-misc/networkmanager/files/networkmanager-0.8.1-fix-ifnet2.patch
new file mode 100644
index 0000000..2d3a22f
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.8.1-fix-ifnet2.patch
@@ -0,0 +1,30 @@
+From 7cbb17396d6ae1c2292f4a2cedf4f3da2a70435e Mon Sep 17 00:00:00 2001
+From: Mu Qiao <qiaomuf@gmail.com>
+Date: Wed, 18 Aug 2010 21:02:04 +0800
+Subject: [PATCH] reading: Completely ignore invalid connections
+ Signed-off-by: Mu Qiao <qiaomuf@gmail.com>
+
+---
+ system-settings/plugins/ifnet/connection_parser.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c
+index 9634ba4..f9fae51 100644
+--- a/system-settings/plugins/ifnet/connection_parser.c
++++ b/system-settings/plugins/ifnet/connection_parser.c
+@@ -1698,10 +1698,10 @@ ifnet_update_connection_from_config_block (gchar * conn_name, GError ** error)
+ 	if (error && *error)
+ 		PLUGIN_WARN (IFNET_PLUGIN_NAME,
+ 			     "Found error: %s", (*error)->message);
+-	if (!success)
+-		g_object_unref (setting);
+ 	PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Connection verified %s:%d", conn_name,
+ 		      success);
++	if (!success)
++		goto error;
+ 	return connection;
+       error:
+ 	g_object_unref (setting);
+-- 
+1.6.1
+
diff --git a/net-misc/networkmanager/networkmanager-0.8.1-r4.ebuild b/net-misc/networkmanager/networkmanager-0.8.1-r5.ebuild
index d631253..32113dd 100644
--- a/net-misc/networkmanager/networkmanager-0.8.1-r4.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.8.1-r5.ebuild
@@ -59,6 +59,7 @@ src_prepare() {
 	# Gentoo system-plugin
 	epatch "${DISTDIR}/${PN}-ifnet-308267b4.patch"
 	epatch "${FILESDIR}/${P}-fix-ifnet1.patch"
+	epatch "${FILESDIR}/${P}-fix-ifnet2.patch"
 
 	# Fix up the dbus conf file to use plugdev group
 	epatch "${FILESDIR}/${P}-confchanges.patch"