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, 72 insertions, 0 deletions

diff --git a/examples/python/nmex.py b/examples/python/nmex.py
new file mode 100644
index 00000000..a85eecaf
--- /dev/null
+++ b/examples/python/nmex.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env python
+# -*- Mode: Python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# vim: ft=python ts=4 sts=4 sw=4 et ai
+
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright 2018 Red Hat, Inc.
+
+###############################################################################
+# nmex.py contains helper functions used by some examples. The helper functions
+# should be simple and independent, so that the user can extract them easily
+# when modifying the example to his needs.
+###############################################################################
+
+def _sys_clock_gettime_ns_lazy():
+    import ctypes
+
+    class timespec(ctypes.Structure):
+        _fields_ = [
+                ('tv_sec', ctypes.c_long),
+                ('tv_nsec', ctypes.c_long)
+        ]
+
+    librt = ctypes.CDLL('librt.so.1', use_errno=True)
+    clock_gettime = librt.clock_gettime
+    clock_gettime.argtypes = [ctypes.c_int, ctypes.POINTER(timespec)]
+
+    t = timespec()
+    def f(clock_id):
+        if clock_gettime(clock_id, ctypes.pointer(t)) != 0:
+            import os
+            errno_ = ctypes.get_errno()
+            raise OSError(errno_, os.strerror(errno_))
+        return (t.tv_sec * 1000000000) + t.tv_nsec
+    return f
+
+_sys_clock_gettime_ns = None
+
+# call POSIX clock_gettime() and return it as integer (in nanoseconds)
+def sys_clock_gettime_ns(clock_id):
+    global _sys_clock_gettime_ns
+    if _sys_clock_gettime_ns is None:
+        _sys_clock_gettime_ns = _sys_clock_gettime_ns_lazy()
+    return _sys_clock_gettime_ns(clock_id)
+
+def nm_boot_time_ns():
+    # NetworkManager exposes some timestamps as CLOCK_BOOTTIME.
+    # Try that first (number 7).
+    try:
+        return sys_clock_gettime_ns(7)
+    except OSError as e:
+        # On systems, where this is not available, fallback to
+        # CLOCK_MONOTONIC (numeric 1).
+        # That is what NetworkManager does as well.
+        import errno
+        if e.errno == errno.EINVAL:
+            return sys_clock_gettime_ns(1)
+        raise
+def nm_boot_time_us():
+    return nm_boot_time_ns() / 1000
+def nm_boot_time_ms():
+    return nm_boot_time_ns() / 1000000
+def nm_boot_time_s():
+    return nm_boot_time_ns() / 1000000000
+
+###############################################################################