Author: sls Date: Thu Jun 14 08:57:00 2012 GMT Module: packages Tag: HEAD ---- Log message: - added patch from debian for "nmcli con" problem
---- Files affected: packages/NetworkManager: NetworkManager.spec (1.111 -> 1.112) , 11-initialize-nm-remote-settings.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/NetworkManager/NetworkManager.spec diff -u packages/NetworkManager/NetworkManager.spec:1.111 packages/NetworkManager/NetworkManager.spec:1.112 --- packages/NetworkManager/NetworkManager.spec:1.111 Thu Jun 14 10:51:25 2012 +++ packages/NetworkManager/NetworkManager.spec Thu Jun 14 10:56:54 2012 @@ -21,6 +21,7 @@ Patch1: ifcfg-path.patch Patch2: systemd-fallback.patch Patch3: llh340.patch +Patch4: 11-initialize-nm-remote-settings.patch URL: http://projects.gnome.org/NetworkManager/ BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1:1.10 @@ -140,6 +141,7 @@ %patch1 -p1 %{?with_systemd:%patch2 -p1} %patch3 -p1 +%patch4 -p1 %build %{__gtkdocize} @@ -314,6 +316,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.112 2012/06/14 08:56:54 sls +- added patch from debian for "nmcli con" problem + Revision 1.111 2012/06/14 08:51:25 sls - added llh340.patch ================================================================ Index: packages/NetworkManager/11-initialize-nm-remote-settings.patch diff -u /dev/null packages/NetworkManager/11-initialize-nm-remote-settings.patch:1.1 --- /dev/null Thu Jun 14 10:57:00 2012 +++ packages/NetworkManager/11-initialize-nm-remote-settings.patch Thu Jun 14 10:56:54 2012 @@ -0,0 +1,27 @@ +commit dd0460697c4e281fe277b53916d5251332e1aafc +Author: Jiří Klimeš <[email protected]> +Date: Tue Mar 27 22:36:55 2012 +0200 + + libnm-glib: initialize NMRemoteSettings in nm_remote_settings_new() (rh #806664) + + The object was not initialized after creation in nm_remote_settings_new(). This + was a regression caused by 762df85234e7a042a2a5d31053e6cc273ae3e2ec. + +diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c +index 8f213f9..b6b6c18 100644 +--- a/libnm-glib/nm-remote-settings.c ++++ b/libnm-glib/nm-remote-settings.c +@@ -728,7 +728,12 @@ properties_changed_cb (DBusGProxy *proxy, + NMRemoteSettings * + nm_remote_settings_new (DBusGConnection *bus) + { +- return g_object_new (NM_TYPE_REMOTE_SETTINGS, NM_REMOTE_SETTINGS_BUS, bus, NULL); ++ NMRemoteSettings *settings; ++ ++ settings = g_object_new (NM_TYPE_REMOTE_SETTINGS, NM_REMOTE_SETTINGS_BUS, bus, NULL); ++ ++ _nm_remote_settings_ensure_inited (settings); ++ return settings; + } + + static void ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/NetworkManager/NetworkManager.spec?r1=1.111&r2=1.112 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
