From 01609e485803fa250413385ae209660fb7b30a2e Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Mon, 17 Nov 2025 17:43:34 +0100
Subject: New upstream version 1.54.2

---
 src/nmcli/gen-metadata-nm-settings-nmcli.xml.in | 7 +++++++
 src/nmcli/general.c                             | 6 +++---
 src/nmcli/nmcli.c                               | 1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/nmcli')

diff --git a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
index 67b14d4c..854a0227 100644
--- a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
+++ b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
@@ -1235,6 +1235,13 @@
                   nmcli-description="The protocol used by the interface, whether it is PRP or HSR."
                   format="boolean"
                   values="true/yes/on, false/no/off" />
+        <property name="protocol-version"
+                  nmcli-description="Configures the protocol version to be used for the HSR/PRP interface. &quot;default&quot; (-1) sets the protocol version to the default version for the protocol. &quot;hsr-2010&quot; (0) sets the protocol version to HSRv0 (IEC 62439-3:2010). &quot;hsr-2012&quot; (1) sets the protocol version to HSRv1 (IEC 62439-3:2012)."
+                  format="choice (NMSettingHsrProtocolVersion)"
+                  values="default (-1), hsr-2010 (0), hsr-2012 (1)" />
+        <property name="interlink"
+                  nmcli-description="The optional interlink port name of the HSR interface."
+                  format="string" />
     </setting>
     <setting name="infiniband" >
         <property name="mac-address"
diff --git a/src/nmcli/general.c b/src/nmcli/general.c
index 2e9aad44..a2772ca3 100644
--- a/src/nmcli/general.c
+++ b/src/nmcli/general.c
@@ -28,7 +28,7 @@ static void permission_changed(GObject *gobject, GParamSpec *pspec, NmCli *nmc);
 static NM_UTILS_LOOKUP_STR_DEFINE(nm_state_to_string,
                                   NMState,
                                   NM_UTILS_LOOKUP_DEFAULT(N_("unknown")),
-                                  NM_UTILS_LOOKUP_ITEM(NM_STATE_ASLEEP, N_("asleep")),
+                                  NM_UTILS_LOOKUP_ITEM(NM_STATE_DISABLED, N_("network off")),
                                   NM_UTILS_LOOKUP_ITEM(NM_STATE_CONNECTING, N_("connecting")),
                                   NM_UTILS_LOOKUP_ITEM(NM_STATE_CONNECTED_LOCAL,
                                                        N_("connected (local only)")),
@@ -53,8 +53,8 @@ state_to_color(NMState state)
         return NM_META_COLOR_STATE_CONNECTED_GLOBAL;
     case NM_STATE_DISCONNECTING:
         return NM_META_COLOR_STATE_DISCONNECTING;
-    case NM_STATE_ASLEEP:
-        return NM_META_COLOR_STATE_ASLEEP;
+    case NM_STATE_DISABLED:
+        return NM_META_COLOR_STATE_DISABLED;
     case NM_STATE_DISCONNECTED:
         return NM_META_COLOR_STATE_DISCONNECTED;
     default:
diff --git a/src/nmcli/nmcli.c b/src/nmcli/nmcli.c
index cfe4c5f4..09e15db9 100644
--- a/src/nmcli/nmcli.c
+++ b/src/nmcli/nmcli.c
@@ -581,6 +581,7 @@ static NM_UTILS_STRING_TABLE_LOOKUP_DEFINE(
     {"permission-unknown", NM_META_COLOR_PERMISSION_UNKNOWN},
     {"permission-yes", NM_META_COLOR_PERMISSION_YES},
     {"prompt", NM_META_COLOR_PROMPT},
+    {"state-disabled", NM_META_COLOR_STATE_DISABLED},
     {"state-asleep", NM_META_COLOR_STATE_ASLEEP},
     {"state-connected-global", NM_META_COLOR_STATE_CONNECTED_GLOBAL},
     {"state-connected-local", NM_META_COLOR_STATE_CONNECTED_LOCAL},
-- 
cgit 1.3.0-6-gf8a5