Accepting request 1091113 from home:lee_duncan:branches:Base:System

- Update to version 2.1.56:
  * version 2.1.56
  * Revert "fix setting preference rollback error"
  * version 2.1.55
  * Fix changing savedir directory mode
  * targetcli: avoild Ctrl+C print error stack
  * fix setting preference rollback error
  Also, remove patch no longer needed (since it's upstream):
  * Fix-changing-savedir-directory-mode.patch

OBS-URL: https://build.opensuse.org/request/show/1091113
OBS-URL: https://build.opensuse.org/package/show/Base:System/targetcli-fb?expand=0&rev=53

Fix-changing-savedir-directory-mode.patch

@@ -1,47 +0,0 @@
-From b8eb1933d4fdcbe806edead8cfa94879d0fc2015 Mon Sep 17 00:00:00 2001
-From: Lee Duncan <lduncan@suse.com>
-Date: Mon, 24 Apr 2023 10:34:39 -0700
-Subject: [PATCH] Fix changing savedir directory mode
-
-Commit 9f5764dac39b ("saveconfig: set right perms on /etc/target/ dir")
-fixed CVE-2020-13867 by ensuring that the mode of the target
-meta-data directory (/etc/target) was always mode 0600. But users
-can specify a different directory, such as "/tmp", and we don't
-want targetcli changing the mode of such directories to 0600. So
-only change the mode of the directory, when saving a config file,
-if the directory is /etc/target.
----
- targetcli/ui_root.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/targetcli/ui_root.py b/targetcli/ui_root.py
-index 39e5ee99c342..79ee985ba935 100644
---- a/targetcli/ui_root.py
-+++ b/targetcli/ui_root.py
-@@ -34,8 +34,9 @@ from .ui_backstore import complete_path, UIBackstores
- from .ui_node import UINode
- from .ui_target import UIFabricModule
- 
--default_save_file = "/etc/target/saveconfig.json"
--universal_prefs_file = "/etc/target/targetcli.conf"
-+default_target_dir = "/etc/target"
-+default_save_file = os.path.join(default_target_dir, "saveconfig.json")
-+universal_prefs_file = os.path.join(default_target_dir, "targetcli.conf")
- 
- class UIRoot(UINode):
-     '''
-@@ -112,8 +113,9 @@ class UIRoot(UINode):
-             finally:
-                 os.umask(umask_original)
-         else:
--            if (os.stat(dirname).st_mode & 0o777) != mode:
--                os.chmod(dirname, mode)
-+            if dirname == default_target_dir:
-+                if (os.stat(dirname).st_mode & 0o777) != mode:
-+                    os.chmod(dirname, mode)
- 
-     def _save_backups(self, savefile):
-         '''
--- 
-2.35.3
-

_service

@@ -7,7 +7,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(\d*\.\d*\.)(\d*)</param>
     <param name="versionrewrite-replacement">\1\2</param>
-    <param name="revision">v2.1.54</param>
+    <param name="revision">v2.1.56</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="recompress" mode="disabled">

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/open-iscsi/targetcli-fb.git</param>
-              <param name="changesrevision">033cf1c2d34c73cce84c4c12c7383188167bf9e5</param></service></servicedata>
+              <param name="changesrevision">e868e08ec9c41fac45d00afcc28a498983982c38</param></service></servicedata>

targetcli-fb-2.1.54.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1fa7bfc19ba948b0122888330e7c411c0cfe7990f6db2aca5b9f403c03e6220d
-size 34184

targetcli-fb-2.1.56.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e156ce2f75e01cd98010142e63f45d4311b6b328f399fa5f2aa0bf9b10a81eac
+size 34392

targetcli-fb.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jun 06 14:52:19 UTC 2023 - lduncan@suse.com
+
+- Update to version 2.1.56:
+  * version 2.1.56
+  * Revert "fix setting preference rollback error"
+  * version 2.1.55
+  * Fix changing savedir directory mode
+  * targetcli: avoild Ctrl+C print error stack
+  * fix setting preference rollback error
+  Also, remove patch no longer needed (since it's upstream):
+  * Fix-changing-savedir-directory-mode.patch
+
 -------------------------------------------------------------------
 Tue Apr 25 17:20:02 UTC 2023 - Lee Duncan <lduncan@suse.com>
 

targetcli-fb.spec

@@ -18,7 +18,7 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           targetcli-fb
-Version:        2.1.54
+Version:        2.1.56
 Release:        0
 Summary:        A command shell for managing the Linux LIO kernel target
 License:        Apache-2.0
@@ -60,9 +60,6 @@ Obsoletes:      targetcli-rbd < %{version}
 Patch1:         Split-out-blockdev-readonly-state-detection-helper.patch
 Patch2:         rbd-support.patch
 
-# upstream
-Patch3:         Fix-changing-savedir-directory-mode.patch
-
 %python_subpackages
 
 %description
@@ -91,7 +88,6 @@ all python-version-dependant packages, such as python3-*-targetcli-fb.
 # RBD support is dependent on LIO changes present in the SLE/Leap kernel
 %patch2 -p1
 %endif
-%patch3 -p1
 
 %build
 %python_build