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)

3 files changed, 98 insertions, 0 deletions

diff --git a/data/90-nm-thunderbolt.rules b/data/90-nm-thunderbolt.rules
new file mode 100644
index 00000000..52d8bb41
--- /dev/null
+++ b/data/90-nm-thunderbolt.rules
@@ -0,0 +1,13 @@
+# Do not modify this file, it will get overwritten on updates.
+# To override or extend the rules place a file in /etc/udev/rules.d
+
+ACTION!="add", GOTO="nm_thunderbolt_end"
+
+# Load he thunderbolt-net driver if we a device of type thunderbolt_xdomain
+# is added.
+SUBSYSTEM=="thunderbolt", ENV{DEVTYPE}=="thunderbolt_xdomain", RUN{builtin}+="kmod load thunderbolt-net"
+
+# For all thunderbolt network devices, we want to enable link-local configuration
+SUBSYSTEM=="net", ENV{ID_NET_DRIVER}=="thunderbolt-net", ENV{NM_AUTO_DEFAULT_LINK_LOCAL_ONLY}="1"
+
+LABEL="nm_thunderbolt_end"
diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
index 95d58f96..2692935e 100644
--- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in
@@ -27,3 +27,8 @@ WantedBy=multi-user.target
 Alias=dbus-org.freedesktop.NetworkManager.service
 Also=NetworkManager-dispatcher.service
 
+# We want to enable NetworkManager-wait-online.service whenever this service
+# is enabled. NetworkManager-wait-online.service has
+# WantedBy=network-online.target, so enabling it only has an effect if
+# network-online.target itself is enabled or pulled in by some other unit.
+Also=NetworkManager-wait-online.service
diff --git a/data/meson.build b/data/meson.build
new file mode 100644
index 00000000..636db921
--- /dev/null
+++ b/data/meson.build
@@ -0,0 +1,80 @@
+data_conf = configuration_data()
+data_conf.set('bindir', nm_bindir)
+data_conf.set('libexecdir', nm_libexecdir)
+data_conf.set('sbindir', nm_sbindir)
+data_conf.set('sysconfdir', nm_sysconfdir)
+data_conf.set('DISTRO_NETWORK_SERVICE', (enable_ifcfg_rh ? 'network.service' : ''))
+data_conf.set('NM_MODIFY_SYSTEM_POLICY', (enable_modify_system ? 'yes' : 'auth_admin_keep'))
+
+server = 'server.conf'
+
+configure_file(
+  input: server + '.in',
+  output: server,
+  install: true,
+  install_dir: join_paths(nm_datadir, 'doc', nm_name, 'examples'),
+  configuration: data_conf
+)
+
+if install_systemd_unit_dir
+  services = [
+    ['NetworkManager-dispatcher.service', systemd_system_unit_dir],
+    ['NetworkManager.service', systemd_system_unit_dir],
+    ['org.freedesktop.NetworkManager.service', dbus_sys_dir]
+  ]
+
+  if have_systemd_200
+    services += [['NetworkManager-wait-online.service', systemd_system_unit_dir]]
+  else
+    services += [['NetworkManager-wait-online-systemd-pre200.service', systemd_system_unit_dir]]
+  endif
+
+  foreach service: services
+    configure_file(
+      input: service[0] + '.in',
+      output: service[0],
+      install: true,
+      install_dir: service[1],
+      configuration: data_conf
+    )
+  endforeach
+
+  if enable_ovs
+    install_data(
+      'NetworkManager-ovs.conf',
+      install_dir: join_paths(systemd_system_unit_dir, 'NetworkManager.service.d')
+    )
+  endif
+endif
+
+if install_udev_dir
+  data = files(
+    '84-nm-drivers.rules',
+    '85-nm-unmanaged.rules',
+    '90-nm-thunderbolt.rules'
+  )
+
+  install_data(
+    data,
+    install_dir: join_paths(udev_dir, 'rules.d')
+  )
+endif
+
+if enable_polkit
+  policy = 'org.freedesktop.NetworkManager.policy'
+
+  policy_in = configure_file(
+    input: policy + '.in.in',
+    output: policy + '.in',
+    configuration: data_conf
+  )
+
+  custom_target(
+    policy,
+    input: policy_in,
+    output: policy,
+    command: intltool_xml_cmd,
+    install: true,
+    install_dir: polkit_dir
+  )
+endif