Mailinglist Archive: opensuse-commit (1792 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package NetworkManager for openSUSE:11.4
checked in at Tue Feb 22 17:23:39 CET 2011.



--------
--- old-versions/11.4/all/NetworkManager/NetworkManager.changes 2011-02-15 
10:16:41.000000000 +0100
+++ 11.4/NetworkManager/NetworkManager.changes  2011-02-21 11:38:57.000000000 
+0100
@@ -1,0 +2,5 @@
+Mon Feb 21 10:11:47 UTC 2011 - binli@xxxxxxxxxxxx
+
+- Add nm-destory-crash.patch, fix crash when NM exit(bnc#673627).
+
+-------------------------------------------------------------------

calling whatdependson for 11.4-i586


New:
----
  nm-destory-crash.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.oE3DOv/_old  2011-02-22 17:22:20.000000000 +0100
+++ /var/tmp/diff_new_pack.oE3DOv/_new  2011-02-22 17:22:20.000000000 +0100
@@ -20,7 +20,7 @@
 Name:           NetworkManager
 Url:            http://www.gnome.org/projects/NetworkManager/
 Version:        0.8.2
-Release:        15.<RELEASE3>
+Release:        15.<RELEASE4>
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-devel dbus-1-glib-devel gtk-doc intltool iptables 
libgcrypt-devel libgudev-1_0-devel libiw-devel libnl-devel libtool 
libuuid-devel mozilla-nss-devel polkit-devel ppp-devel 
translation-update-upstream wireless-tools
@@ -43,6 +43,8 @@
 Patch3:         nm-ignore-temp-files.patch
 # PATCH-FIX-UPSTREAM nm-stop-touching-hosts.patch bnc#667265 
binli@xxxxxxxxxxxx -- Stop touching /etc/hosts. Taken from git            
 Patch4:         nm-stop-touching-hosts.patch
+# PATCH-FIX-UPSTREAM nm-destory-crash.patch bnc#673627 binli@xxxxxxxxxxxx -- 
Fix crash when NM exit.
+Patch5:         nm-destory-crash.patch
 Requires:       %{name}-glib = %{version}
 Requires:       dhcp-client
 Requires:       iproute2
@@ -116,6 +118,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 translation-update-upstream
 
 %build

++++++ nm-destory-crash.patch ++++++
Index: NetworkManager-0.8.2/src/nm-manager.c
===================================================================
--- NetworkManager-0.8.2.orig/src/nm-manager.c
+++ NetworkManager-0.8.2/src/nm-manager.c
@@ -4351,10 +4351,11 @@ dispose (GObject *object)
 
        /* Unregister property filter */
        bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
-       g_assert (bus);
-       dbus_connection = dbus_g_connection_get_connection (bus);
-       g_assert (dbus_connection);
-       dbus_connection_remove_filter (dbus_connection, prop_filter, manager);
+       if (bus) {
+               dbus_connection = dbus_g_connection_get_connection (bus);
+               g_assert (dbus_connection);
+               dbus_connection_remove_filter (dbus_connection, prop_filter, 
manager);
+       }
        g_object_unref (priv->dbus_mgr);
 
        if (priv->bluez_mgr)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx