From defe821dd9aa26bc53d9548d8c25552e31e48258 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Tue, 28 Nov 2023 15:51:43 +0100
Subject: [PATCH] * Tue Nov 28 2023 Tomas Bzatek <tbzatek@redhat.com> -
 2.9.4-10 - tests: Fix targetcli_config.json (RHEL-16229)

---
 .udisks2.metadata                             |  1 +
 udisks-2.11.0-targetcli_config_attr_fix.patch | 38 +++++++++++++++++++
 udisks2.spec                                  |  7 +++-
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 .udisks2.metadata
 create mode 100644 udisks-2.11.0-targetcli_config_attr_fix.patch

diff --git a/.udisks2.metadata b/.udisks2.metadata
new file mode 100644
index 0000000..bbb4988
--- /dev/null
+++ b/.udisks2.metadata
@@ -0,0 +1 @@
+e6f21e90456360723d80265c4d3372eb88ef7a6e udisks-2.9.4.tar.bz2
diff --git a/udisks-2.11.0-targetcli_config_attr_fix.patch b/udisks-2.11.0-targetcli_config_attr_fix.patch
new file mode 100644
index 0000000..e40f136
--- /dev/null
+++ b/udisks-2.11.0-targetcli_config_attr_fix.patch
@@ -0,0 +1,38 @@
+From acae6bf4594f80da57855343ab325f87386178c4 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Fri, 3 Nov 2023 16:40:54 +0100
+Subject: [PATCH] tests: Fix targetcli_config.json
+
+Not all attributes are available anymore in newer kernel versions.
+---
+ src/tests/dbus-tests/targetcli_config.json | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/tests/dbus-tests/targetcli_config.json b/src/tests/dbus-tests/targetcli_config.json
+index 3be9eac2be..f50bf7d4d2 100644
+--- a/src/tests/dbus-tests/targetcli_config.json
++++ b/src/tests/dbus-tests/targetcli_config.json
+@@ -331,7 +331,6 @@
+             "demo_mode_write_protect": 0,
+             "generate_node_acls": 1,
+             "login_timeout": 15,
+-            "netif_timeout": 2,
+             "prod_mode_write_protect": 0,
+             "t10_pi": 0,
+             "tpg_enabled_sendtargets": 1
+@@ -393,7 +392,6 @@
+             "demo_mode_write_protect": 1,
+             "generate_node_acls": 0,
+             "login_timeout": 15,
+-            "netif_timeout": 2,
+             "prod_mode_write_protect": 0,
+             "t10_pi": 0,
+             "tpg_enabled_sendtargets": 1
+@@ -479,7 +477,6 @@
+             "demo_mode_write_protect": 1,
+             "generate_node_acls": 0,
+             "login_timeout": 15,
+-            "netif_timeout": 2,
+             "prod_mode_write_protect": 0,
+             "t10_pi": 0,
+             "tpg_enabled_sendtargets": 1
diff --git a/udisks2.spec b/udisks2.spec
index 3955790..51ee148 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -48,7 +48,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 URL:     https://github.com/storaged-project/udisks
 Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
@@ -85,6 +85,8 @@ Patch19: udisks-2.10.0-lvm2_vgcreate_uevent_sync.patch
 Patch20: udisks-2.9.4-tests_job_unstable.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2213769
 Patch21: udisks-2.10.0-iscsi-ibft-chap-auth.patch
+# https://issues.redhat.com/browse/RHEL-16229
+Patch22: udisks-2.11.0-targetcli_config_attr_fix.patch
 
 BuildRequires: make
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -460,6 +462,9 @@ fi
 %endif
 
 %changelog
+* Tue Nov 28 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-10
+- tests: Fix targetcli_config.json (RHEL-16229)
+
 * Wed Aug 02 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.9.4-9
 - iscsi: Fix login on firmware-discovered nodes (#2213769)