Import Debian changes 1.12.2-0ubuntu3

network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium

  * debian/rules:
    - use --with-libnm-glib, the default reversed since that's a legacy
      library but we still need it for unity-control-center

network-manager (1.12.2-0ubuntu2) cosmic; urgency=medium

  * debian/patches/git-newglib-test.patch:
    - backport upstream commit to fix the tests with the new glib 

network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium

  * New upstream version
  * d/p/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch,
    d/p/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch,
    d/p/git_thunderbolt_connect.patch:
    - removed, those changes are in the new version
  * Backport Debian changes
  * Update symbols file for libnm0
  * Enable iwd support
  * Drop version requirements when oldstable ships a newer version
  * Drop dh_strip override, the dbgsym migration is done
  * Rebase patches
  * Make sure the example server.conf is actually installed
  * Update install path for plugins, it now includes a version number
  * Drop libnl3 build dependency.
    Upstream has copied the code directly from libnl3 for the few functions it
    needs with a few small modifications.
  * Drop libiw build dependency.
    Hasn't been needed for a long time and was simply a left over from older
    releases.
  * Bump Standards-Version to 4.1.5
  * Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)

1 files changed, 312 insertions, 0 deletions

diff --git a/src/nm-dbus-utils.c b/src/nm-dbus-utils.c
new file mode 100644
index 00000000..8e7dd122
--- /dev/null
+++ b/src/nm-dbus-utils.c
@@ -0,0 +1,312 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2018 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include "nm-dbus-utils.h"
+
+#include "nm-dbus-object.h"
+
+/*****************************************************************************/
+
+const GDBusSignalInfo nm_signal_info_property_changed_legacy = NM_DEFINE_GDBUS_SIGNAL_INFO_INIT (
+	"PropertiesChanged",
+	.args = NM_DEFINE_GDBUS_ARG_INFOS (
+		NM_DEFINE_GDBUS_ARG_INFO ("properties", "a{sv}"),
+	),
+);
+
+GDBusPropertyInfo *
+nm_dbus_utils_interface_info_lookup_property (const GDBusInterfaceInfo *interface_info,
+                                              const char *property_name,
+                                              guint *property_idx)
+{
+	guint i;
+
+	nm_assert (interface_info);
+	nm_assert (property_name);
+
+	/* there is also g_dbus_interface_info_lookup_property(), however that makes use
+	 * of a global cache. */
+	if (interface_info->properties) {
+		for (i = 0; interface_info->properties[i]; i++) {
+			GDBusPropertyInfo *info = interface_info->properties[i];
+
+			if (nm_streq (info->name, property_name)) {
+				NM_SET_OUT (property_idx, i);
+				return info;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+GDBusMethodInfo *
+nm_dbus_utils_interface_info_lookup_method (const GDBusInterfaceInfo *interface_info,
+                                            const char *method_name)
+{
+	guint i;
+
+	nm_assert (interface_info);
+	nm_assert (method_name);
+
+	/* there is also g_dbus_interface_info_lookup_property(), however that makes use
+	 * of a global cache. */
+	if (interface_info->methods) {
+		for (i = 0; interface_info->methods[i]; i++) {
+			GDBusMethodInfo *info = interface_info->methods[i];
+
+			if (nm_streq (info->name, method_name))
+				return info;
+		}
+	}
+
+	return NULL;
+}
+
+GVariant *
+nm_dbus_utils_get_property (GObject *obj,
+                            const char *signature,
+                            const char *property_name)
+{
+	GParamSpec *pspec;
+	nm_auto_unset_gvalue GValue value = G_VALUE_INIT;
+
+	nm_assert (G_IS_OBJECT (obj));
+	nm_assert (g_variant_type_string_is_valid (signature));
+	nm_assert (property_name && property_name[0]);
+
+	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (obj), property_name);
+	if (!pspec)
+		g_return_val_if_reached (NULL);
+
+	g_value_init (&value, pspec->value_type);
+	g_object_get_property (obj, property_name, &value);
+	/* returns never-floating variant */
+	return g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (signature));
+}
+
+/*****************************************************************************/
+
+void
+nm_dbus_utils_g_value_set_object_path (GValue *value, gpointer object)
+{
+	const char *path;
+
+	g_return_if_fail (!object || NM_IS_DBUS_OBJECT (object));
+
+	if (   object
+	    && (path = nm_dbus_object_get_path (object)))
+		g_value_set_string (value, path);
+	else
+		g_value_set_string (value, NULL);
+}
+
+void
+nm_dbus_utils_g_value_set_object_path_still_exported (GValue *value, gpointer object)
+{
+	const char *path;
+
+	g_return_if_fail (!object || NM_IS_DBUS_OBJECT (object));
+
+	if (   object
+	    && (path = nm_dbus_object_get_path_still_exported (object)))
+		g_value_set_string (value, path);
+	else
+		g_value_set_string (value, "/");
+}
+
+void
+nm_dbus_utils_g_value_set_object_path_from_hash (GValue *value,
+                                                 GHashTable *hash /* has keys of NMDBusObject type. */,
+                                                 gboolean expect_all_exported)
+{
+	NMDBusObject *obj;
+	char **strv;
+	guint i, n;
+	GHashTableIter iter;
+
+	nm_assert (value);
+	nm_assert (hash);
+
+	n = g_hash_table_size (hash);
+	strv = g_new (char *, n + 1);
+	i = 0;
+	g_hash_table_iter_init (&iter, hash);
+	while (g_hash_table_iter_next (&iter, (gpointer *) &obj, NULL)) {
+		const char *path;
+
+		path = nm_dbus_object_get_path (obj);
+		if (!path) {
+			nm_assert (!expect_all_exported);
+			continue;
+		}
+		strv[i++] = g_strdup (path);
+	}
+	nm_assert (i <= n);
+	strv[i] = NULL;
+
+	/* sort the names, to give a well-defined, stable order. */
+	nm_utils_strv_sort (strv, i);
+
+	g_value_take_boxed (value, strv);
+}
+
+const char **
+nm_dbus_utils_get_paths_for_clist (const CList *lst_head,
+                                   gssize lst_len,
+                                   guint member_offset,
+                                   gboolean expect_all_exported)
+{
+	const CList *iter;
+	const char **strv;
+	const char *path;
+	gsize i, n;
+
+	nm_assert (lst_head);
+
+	if (lst_len < 0)
+		n = c_list_length (lst_head);
+	else {
+		n = lst_len;
+		nm_assert (n == c_list_length (lst_head));
+	}
+
+	i = 0;
+	strv = g_new (const char *, n + 1);
+	c_list_for_each (iter, lst_head) {
+		NMDBusObject *obj = (NMDBusObject *) (((const char *) iter) - member_offset);
+
+		path = nm_dbus_object_get_path (obj);
+		if (!path) {
+			nm_assert (expect_all_exported);
+			continue;
+		}
+
+		nm_assert (i < n);
+		strv[i++] = path;
+	}
+	nm_assert (i <= n);
+	strv[i] = NULL;
+
+	return strv;
+}
+
+/*****************************************************************************/
+
+void
+nm_dbus_track_obj_path_init (NMDBusTrackObjPath *track,
+                             GObject *target,
+                             const GParamSpec *pspec)
+{
+	nm_assert (track);
+	nm_assert (G_IS_OBJECT (target));
+	nm_assert (G_IS_PARAM_SPEC (pspec));
+
+	track->_obj = NULL;
+	track->_notify_target = target;
+	track->_notify_pspec = pspec;
+	track->_notify_signal_id = 0;
+	track->_visible = FALSE;
+}
+
+void
+nm_dbus_track_obj_path_deinit (NMDBusTrackObjPath *track)
+{
+	/* we allow deinit() to be called multiple times (e.g. from
+	 * dispose(), which must be re-entrant). */
+	nm_assert (track);
+	nm_assert (!track->_notify_target || G_IS_OBJECT (track->_notify_target));
+
+	nm_clear_g_signal_handler (track->obj, &track->_notify_signal_id);
+	track->_notify_target = NULL;
+	track->_notify_pspec = NULL;
+	track->_visible = FALSE;
+	nm_clear_g_object (&track->_obj);
+}
+
+void
+nm_dbus_track_obj_path_notify (const NMDBusTrackObjPath *track)
+{
+	nm_assert (track);
+	nm_assert (G_IS_OBJECT (track->_notify_target));
+	nm_assert (G_IS_PARAM_SPEC (track->_notify_pspec));
+
+	g_object_notify_by_pspec (track->_notify_target,
+	                          (GParamSpec *) track->_notify_pspec);
+}
+
+const char *
+nm_dbus_track_obj_path_get (const NMDBusTrackObjPath *track)
+{
+	nm_assert (track);
+	nm_assert (G_IS_OBJECT (track->_notify_target));
+
+	return track->obj && track->visible
+	       ? nm_dbus_object_get_path_still_exported (track->obj)
+	       : NULL;
+}
+
+static void
+_track_obj_exported_changed (NMDBusObject *obj,
+                             NMDBusTrackObjPath *track)
+{
+	nm_dbus_track_obj_path_notify (track);
+}
+
+void
+nm_dbus_track_obj_path_set (NMDBusTrackObjPath *track,
+                            gpointer obj,
+                            gboolean visible)
+{
+	gs_unref_object NMDBusObject *old_obj = NULL;
+	const char *old_path;
+
+	nm_assert (track);
+	nm_assert (G_IS_OBJECT (track->_notify_target));
+
+	g_return_if_fail (!obj || NM_IS_DBUS_OBJECT (obj));
+
+	if (   track->obj == obj
+	    && track->visible == !!visible)
+		return;
+
+	old_path = nm_dbus_track_obj_path_get (track);
+
+	track->_visible = visible;
+
+	if (track->obj != obj) {
+		nm_clear_g_signal_handler (track->obj, &track->_notify_signal_id);
+
+		old_obj = track->obj;
+		track->_obj = nm_g_object_ref (obj);
+
+		if (obj) {
+			track->_notify_signal_id = g_signal_connect (obj,
+			                                             NM_DBUS_OBJECT_EXPORTED_CHANGED,
+			                                             G_CALLBACK (_track_obj_exported_changed),
+			                                             track);
+		}
+	}
+
+	if (!nm_streq0 (old_path, nm_dbus_track_obj_path_get (track)))
+		nm_dbus_track_obj_path_notify (track);
+}