[arch-commits] Commit in networkmanager/trunk (PKGBUILD initialize-GError.patch)

[Ionut Biru]

    Date: Tuesday, April 24, 2012 @ 04:08:17
  Author: ibiru
Revision: 157119

fix gnome-shell crash

Added:
  networkmanager/trunk/initialize-GError.patch
Modified:
  networkmanager/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    9 ++++++---
 initialize-GError.patch |   23 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-24 06:54:35 UTC (rev 157118)
+++ PKGBUILD	2012-04-24 08:08:17 UTC (rev 157119)
@@ -8,7 +8,7 @@
 pkgname=networkmanager
 _pkgname=NetworkManager
 pkgver=0.9.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -27,17 +27,20 @@
 install=networkmanager.install
 #source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-master.tar.xz
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch)
+        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch
+         initialize-GError.patch)
 sha256sums=('eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb')
+            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
+            '95c06ad34c131b1db0f28d6e78003bd8fd0a3ba903f76027381e3c4c411c6cb6')
 
 build() {
   cd $_pkgname-$pkgver
 
   patch -Np1 -i ../disable_set_hostname.patch
   patch -Np1 -i ../dnsmasq-path.patch
+  patch -Np1 -i ../initialize-GError.patch
 
   ./configure \
     --prefix=/usr \

Added: initialize-GError.patch
===================================================================
--- initialize-GError.patch	                        (rev 0)
+++ initialize-GError.patch	2012-04-24 08:08:17 UTC (rev 157119)
@@ -0,0 +1,23 @@
+From 8bb278944496102a4afad46b53e1e8279425aaac Mon Sep 17 00:00:00 2001
+From: Jiří Klimeš <jklimes at redhat.com>
+Date: Mon, 02 Apr 2012 14:37:55 +0000
+Subject: libnm-glib: initialize GError, else invalid free() crash can occur (rh #809123)
+
+---
+(limited to 'libnm-glib/nm-remote-settings.c')
+
+diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
+index 9a81a8d..68aaeb4 100644
+--- a/libnm-glib/nm-remote-settings.c
++++ b/libnm-glib/nm-remote-settings.c
+@@ -109,7 +109,7 @@ static void
+ _nm_remote_settings_ensure_inited (NMRemoteSettings *self)
+ {
+ 	NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (self);
+-	GError *error;
++	GError *error = NULL;
+ 
+ 	if (!priv->inited) {
+ 		if (!g_initable_init (G_INITABLE (self), NULL, &error)) {
+--
+cgit v0.9.0.2-2-gbebe