Merge tag 'debian/1.42.4-1' into debian/bullseye-backports

network-manager Debian release 1.42.4-1

6 files changed, 48 insertions, 3 deletions

diff --git a/introspection/meson.build b/introspection/meson.build
index 7d495f7a..9a355488 100644
--- a/introspection/meson.build
+++ b/introspection/meson.build
@@ -17,6 +17,7 @@ ifaces = [
   'org.freedesktop.NetworkManager.Device.Generic',
   'org.freedesktop.NetworkManager.Device.IPTunnel',
   'org.freedesktop.NetworkManager.Device.Infiniband',
+  'org.freedesktop.NetworkManager.Device.Loopback',
   'org.freedesktop.NetworkManager.Device.Lowpan',
   'org.freedesktop.NetworkManager.Device.Macsec',
   'org.freedesktop.NetworkManager.Device.Macvlan',
diff --git a/introspection/org.freedesktop.NetworkManager.Connection.Active.xml b/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
index ebcdf952..faab73a0 100644
--- a/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
+++ b/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
@@ -163,9 +163,21 @@
     <property name="Vpn" type="b" access="read"/>
 
     <!--
+        Controller:
+        @Since: 1.44, 1.42.2
+
+        The path to the controller device if the connection is a port. This
+        property replaces the deprecated 'Master' property.
+    -->
+    <property name="Controller" type="o" access="read"/>
+
+    <!--
         Master:
 
-        The path to the master device if the connection is a slave.
+        The path to the controller device if the connection is a port.
+
+        This property is deprecated in favor of the 'Controller'
+        property since 1.44 and 1.42.2.
     -->
     <property name="Master" type="o" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml b/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml
index 475da375..dab7f3b9 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml
@@ -89,6 +89,14 @@
     <property name="FlowLabel" type="u" access="read"/>
 
     <!--
+        FwMark:
+
+        The fwmark value to assign to tunnel packets. This property applies only to
+        VTI tunnels.
+    -->
+    <property name="FwMark" type="u" access="read"/>
+
+    <!--
         Flags:
 
         Tunnel flags.
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Loopback.xml b/introspection/org.freedesktop.NetworkManager.Device.Loopback.xml
new file mode 100644
index 00000000..90236331
--- /dev/null
+++ b/introspection/org.freedesktop.NetworkManager.Device.Loopback.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Loopback:
+      @short_description: Loopback Device.
+  -->
+  <interface name="org.freedesktop.NetworkManager.Device.Loopback"/>
+</node>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.xml b/introspection/org.freedesktop.NetworkManager.Device.xml
index ae626a8e..36f7f5d0 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.xml
@@ -345,8 +345,8 @@
         settings-connection, just like updating the settings-connection can make
         them different.
 
-        Since 1.42, 1.40.10, "preserve-external-ip" flag (0x1) is supported to not
-        remove externally added IP addresses and routes on the device during reapply.
+        Since 1.42, "preserve-external-ip" flag (0x1) is supported to not remove
+        externally added IP addresses and routes on the device during reapply.
     -->
     <method name="Reapply">
       <arg name="connection" type="a{sa{sv}}" direction="in"/>
diff --git a/introspection/org.freedesktop.NetworkManager.xml b/introspection/org.freedesktop.NetworkManager.xml
index 16185706..c92c8017 100644
--- a/introspection/org.freedesktop.NetworkManager.xml
+++ b/introspection/org.freedesktop.NetworkManager.xml
@@ -457,6 +457,22 @@
     <property name="Version" type="s" access="read"/>
 
     <!--
+        VersionInfo:
+
+        NetworkManager version and capabilities.
+
+        The first element in the array is the NM_VERSION of the daemon. It is a binary representation
+        of the "Version" and can be compared numerically. The version is encoded as
+        "(major &lt;&lt; 16 | minor &lt;&lt; 8 | micro)".
+
+        The following elements are a bitfield of static capabilities of the daemon. See
+        #NMVersionInfoCapability for the available capability numbers.
+
+        Since: 1.42
+    -->
+    <property name="VersionInfo" type="au" access="read"/>
+
+    <!--
         Capabilities:
 
         The current set of capabilities. See <link