Import Debian changes 1.18.0-1ubuntu1

network-manager (1.18.0-1ubuntu1) eoan; urgency=medium

  * Update to 1.18, merge on Debian, new version includes nwe support for
    policy routing rules and for VLAN filtering for Linux bridge.
  * Remaining Ubuntu changes
    - Use systemd-resolved instead of dnsmasq
    - debian/control:
      + Depend on isc-dhcp-client instead of recommends
      + Recommend network-manager-pptp
      + Suggest avahi-autoipd for IPv4LL support
    - debian/rules, debian/network-manager.postinst:
      + Don't restart NetworkManager on upgrade but recommend restarting
        the computer
    - debian/rules, debian/network-manager.postinst:
      + Don't install sysvinit scripts or migrate from sysvinit
    - debian/network-manager.postinst:
      + Don't add the netdev group.
      + drop in an empty override file for NetworkManager to manage all
        devices for upgrade from any version, as long as there is no
        netplan configuration yet.
    - debian/default-wifi-powersave-on.conf, debian/rules:
      + Install a config file to enable WiFi powersave
    - Enable build tests
    - Add autopkgtests
    - debian/source_network-manager.py, debian/network-manager.install,
      debian/network-manager.links: Add apport hook
    - Add network-manager-config-connectivity-ubuntu package
    - NetworkManager.conf: disable MAC randomization feature. There is no
      easy way for desktop users to disable this feature yet. And there are
      reports that it doesn't work well with some systems.
    - Update Vcs links to point to Ubuntu branch
    - Add patches. See patch descriptions for more details:
      + Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch
      + Update-dnsmasq-parameters.patch
      + Disable-general-with-expect.patch
      + libnm-Check-self-still-NMManager-or-not.patch
      + dns-manager-don-t-merge-split-DNS-search-domains.patch (but disabled)
      + Read-system-connections-from-run.patch
    - debian/tests/urfkill-integration - don't stop/start network manager
    - Revert "Add Conflicts to network-manager-dev against deprecated libraries"
      This reverts commit b4acc5e03e2b821e1cccc69529bb70826c741942.  We're still
      building libnm-glib for now, so these packages have a use in Ubuntu.
  * Removed delta, not needed anymore
    - debian/network-manager.maintscript
      + Remove /etc/dbus-1/system.d/nm-ofono.conf

1 files changed, 43 insertions, 3 deletions

diff --git a/man/nm-settings.5 b/man/nm-settings.5
index aa08919a..364be468 100644
--- a/man/nm-settings.5
+++ b/man/nm-settings.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 03/15/2019
+.\"      Date: 04/21/2019
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.16.0
+.\"    Source: NetworkManager 1.18.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.16\&.0" "Configuration"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.18\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -981,6 +981,9 @@ l l l l
 l l l l
 l l l l
 l l l l
+l l l l
+l l l l
+l l l l
 l l l l.
 T{
 ageing\-time
@@ -1072,6 +1075,33 @@ TRUE
 T}:T{
 Controls whether Spanning Tree Protocol (STP) is enabled for this bridge\&.
 T}
+T{
+vlan\-default\-pvid
+T}:T{
+uint32
+T}:T{
+1
+T}:T{
+The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames\&.
+T}
+T{
+vlan\-filtering
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+Control whether VLAN filtering is enabled on the bridge\&.
+T}
+T{
+vlans
+T}:T{
+array of vardict
+T}:T{
+[]
+T}:T{
+Array of bridge VLAN objects\&. In addition to the VLANs specified here, the bridge will also have the default\-pvid VLAN configured  by the bridge\&.vlan\-default\-pvid property\&. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]\&.\&.\&. where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash\&.
+T}
 .TE
 .sp 1
 .SS "bridge\-port setting"
@@ -1092,6 +1122,7 @@ T}
 .T&
 l l l l
 l l l l
+l l l l
 l l l l.
 T{
 hairpin\-mode
@@ -1120,6 +1151,15 @@ T}:T{
 T}:T{
 The Spanning Tree Protocol (STP) priority of this bridge port\&.
 T}
+T{
+vlans
+T}:T{
+array of vardict
+T}:T{
+[]
+T}:T{
+Array of bridge VLAN objects\&. In addition to the VLANs specified here, the port will also have the default\-pvid VLAN configured on the bridge by the bridge\&.vlan\-default\-pvid property\&. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]\&.\&.\&. where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash\&.
+T}
 .TE
 .sp 1
 .SS "cdma setting"