packages: NetworkManager/NetworkManager.spec, NetworkManager/NetworkManager...

[wrobell]

Author: wrobell                      Date: Mon Jun 25 18:59:22 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixes nmcli error "settings service is not running"
- rel. 6

---- Files affected:
packages/NetworkManager:
   NetworkManager.spec (1.113 -> 1.114) , NetworkManager-nmcli.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.113 packages/NetworkManager/NetworkManager.spec:1.114
--- packages/NetworkManager/NetworkManager.spec:1.113	Thu Jun 14 10:57:18 2012
+++ packages/NetworkManager/NetworkManager.spec	Mon Jun 25 20:59:17 2012
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
 Version:	0.9.4.0
-Release:	5
+Release:	6
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Admin
@@ -22,6 +22,7 @@
 Patch2:		systemd-fallback.patch
 Patch3:		llh340.patch
 Patch4:		11-initialize-nm-remote-settings.patch
+Patch5:	    %{name}-nmcli.patch
 URL:		http://projects.gnome.org/NetworkManager/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.10
@@ -142,6 +143,7 @@
 %{?with_systemd:%patch2 -p1}
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__gtkdocize}
@@ -316,6 +318,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2012/06/25 18:59:17  wrobell
+- fixes nmcli error "settings service is not running"
+- rel. 6
+
 Revision 1.113  2012/06/14 08:57:18  sls
 - rel. 5
 

================================================================
Index: packages/NetworkManager/NetworkManager-nmcli.patch
diff -u /dev/null packages/NetworkManager/NetworkManager-nmcli.patch:1.1
--- /dev/null	Mon Jun 25 20:59:22 2012
+++ packages/NetworkManager/NetworkManager-nmcli.patch	Mon Jun 25 20:59:17 2012
@@ -0,0 +1,64 @@
+From 8a2267ab6b37948a70c10f0af781be4822a54c6b Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw at gnome.org>
+Date: Thu, 05 Apr 2012 17:30:09 +0000
+Subject: Fix a few misc issues noticed by Coverity
+
+---
+diff --git a/cli/src/settings.c b/cli/src/settings.c
+index bf42292..3e17891 100644
+--- a/cli/src/settings.c
++++ b/cli/src/settings.c
+@@ -607,10 +607,11 @@ vlan_priorities_to_string (NMSettingVlan *s_vlan, NMVlanPriorityMap map)
+ 	for (i = 0; i < nm_setting_vlan_get_num_priorities (s_vlan, map); i++) {
+ 		guint32 from, to;
+ 
+-		nm_setting_vlan_get_priority (s_vlan, map, i, &from, &to);
+-		g_string_append_printf (priorities, "%d:%d,", from, to);
++		if (nm_setting_vlan_get_priority (s_vlan, map, i, &from, &to))
++			g_string_append_printf (priorities, "%d:%d,", from, to);
+ 	}
+-	g_string_truncate (priorities, priorities->len-1);  /* chop off trailing ',' */
++	if (priorities->len)
++		g_string_truncate (priorities, priorities->len-1);  /* chop off trailing ',' */
+ 
+ 	return g_string_free (priorities, FALSE);
+ }
+diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c
+index 71760dc..f87ad92 100644
+--- a/libnm-util/nm-setting-vlan.c
++++ b/libnm-util/nm-setting-vlan.c
+@@ -460,7 +460,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
+ 		return FALSE;
+ 	}
+ 
+-	if (priv->flags & !(NM_VLAN_FLAG_REORDER_HEADERS |
++	if (priv->flags & ~(NM_VLAN_FLAG_REORDER_HEADERS |
+ 	                    NM_VLAN_FLAG_GVRP |
+ 	                    NM_VLAN_FLAG_LOOSE_BINDING)) {
+ 		g_set_error (error,
+diff --git a/src/nm-device-vlan.c b/src/nm-device-vlan.c
+index 14be849..b9c9323 100644
+--- a/src/nm-device-vlan.c
++++ b/src/nm-device-vlan.c
+@@ -643,17 +643,17 @@ nm_device_vlan_new (const char *udi, const char *iface, NMDevice *parent)
+ 			g_object_unref (device);
+ 			return NULL;
+ 		}
+-		priv->vlan_id = vlan_id;
+ 
+ 		if (   parent_ifindex < 0
+ 		    || parent_ifindex != nm_device_get_ip_ifindex (parent)
+-		    || priv->vlan_id < 0) {
++		    || vlan_id < 0) {
+ 			nm_log_warn (LOGD_DEVICE, "(%s): VLAN parent ifindex (%d) or VLAN ID (%d) invalid.",
+ 			             iface, parent_ifindex, priv->vlan_id);
+ 			g_object_unref (device);
+ 			return NULL;
+ 		}
+ 
++		priv->vlan_id = vlan_id;
+ 		priv->parent = g_object_ref (parent);
+ 		priv->parent_state_id = g_signal_connect (priv->parent,
+ 		                                          "state-changed",
+--
+cgit v0.9.0.2-2-gbebe
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/NetworkManager/NetworkManager.spec?r1=1.113&r2=1.114