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

diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html
index 57ffab77..6ee39655 100644
--- a/docs/api/html/nm-settings.html
+++ b/docs/api/html/nm-settings.html
@@ -857,6 +857,27 @@
 <td align="left">TRUE</td>
 <td>Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.</td>
 </tr>
+<tr>
+<td align="left">
+<a name="nm-settings.property.bridge.vlan-default-pvid"></a>vlan-default-pvid</td>
+<td align="left">uint32</td>
+<td align="left">1</td>
+<td>The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames.</td>
+</tr>
+<tr>
+<td align="left">
+<a name="nm-settings.property.bridge.vlan-filtering"></a>vlan-filtering</td>
+<td align="left">boolean</td>
+<td align="left">FALSE</td>
+<td>Control whether VLAN filtering is enabled on the bridge.</td>
+</tr>
+<tr>
+<td align="left">
+<a name="nm-settings.property.bridge.vlans"></a>vlans</td>
+<td align="left">array of vardict</td>
+<td align="left">[]</td>
+<td>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.</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -899,6 +920,13 @@
 <td align="left">32</td>
 <td>The Spanning Tree Protocol (STP) priority of this bridge port.</td>
 </tr>
+<tr>
+<td align="left">
+<a name="nm-settings.property.bridge-port.vlans"></a>vlans</td>
+<td align="left">array of vardict</td>
+<td align="left">[]</td>
+<td>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.</td>
+</tr>
 </tbody>
 </table></div>
 </div>