- fixes nmcli error "settings service is not running"

- rel. 6

Changed files:
    NetworkManager-nmcli.patch -> 1.1
    NetworkManager.spec -> 1.114

diff --git a/NetworkManager-nmcli.patch b/NetworkManager-nmcli.patch
new file mode 100644 (file)
index 0000000..40153f4
--- /dev/null
+++ b/NetworkManager-nmcli.patch
@@ -0,0 +1,64 @@
+From 8a2267ab6b37948a70c10f0af781be4822a54c6b Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@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

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 22b701f36aa7975b284b35303485ea4b766e46b9..32ae778ff53e832069edb97c004209187269c06e 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,7 +7,7 @@ Summary:        Network Manager for GNOME
 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
@@ -21,6 +21,7 @@ Patch1:               ifcfg-path.patch
 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
@@ -141,6 +142,7 @@ Statyczne biblioteki Network Managera.
 %{?with_systemd:%patch2 -p1}
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__gtkdocize}