From c2b46d74a3b0437341572fe5135e6f2bb8e1c986 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 21 Jun 2022 18:21:02 +0000
Subject: [PATCH] Auto sync2gitlab import of python-rtslib-2.1.75-4.el8.src.rpm

---
 .gitignore                              |  1 +
 0001-Turn-off-unsupported-fabrics.patch |  6 ++++--
 0002-default_dbroot.patch               | 24 +++++++++++-------------
 python-rtslib.spec                      | 17 +++++++++++++++--
 sources                                 |  2 +-
 5 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index b933ca5..b42ef5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /rtslib-fb-2.1.74.tar.gz
+/rtslib-fb-2.1.75.tar.gz
diff --git a/0001-Turn-off-unsupported-fabrics.patch b/0001-Turn-off-unsupported-fabrics.patch
index 3ef3e34..2070417 100644
--- a/0001-Turn-off-unsupported-fabrics.patch
+++ b/0001-Turn-off-unsupported-fabrics.patch
@@ -1,15 +1,17 @@
 diff --git a/rtslib/fabric.py b/rtslib/fabric.py
-index 02e156c..ff7387f 100644
+index eb8f115..c408661 100644
 --- a/rtslib/fabric.py
 +++ b/rtslib/fabric.py
-@@ -464,13 +464,13 @@ fabric_modules = {
+@@ -519,14 +519,14 @@ fabric_modules = {
      "srpt": SRPTFabricModule,
      "iscsi": ISCSIFabricModule,
      "loopback": LoopbackFabricModule,
 -    "qla2xxx": Qla2xxxFabricModule,
+-    "efct": EfctFabricModule,
 -    "sbp": SBPFabricModule,
 -    "tcm_fc": FCoEFabricModule,
 +#    "qla2xxx": Qla2xxxFabricModule,
++#    "efct": EfctFabricModule,
 +#    "sbp": SBPFabricModule,
 +#    "tcm_fc": FCoEFabricModule,
  #    "usb_gadget": USBGadgetFabricModule, # very rare, don't show
diff --git a/0002-default_dbroot.patch b/0002-default_dbroot.patch
index 1317489..35ded5e 100644
--- a/0002-default_dbroot.patch
+++ b/0002-default_dbroot.patch
@@ -1,22 +1,13 @@
 diff --git a/rtslib/root.py b/rtslib/root.py
-index 2c5cf43..34bc57d 100644
+index ac40752..8e9724b 100644
 --- a/rtslib/root.py
 +++ b/rtslib/root.py
-@@ -166,21 +166,21 @@ class RTSRoot(CFSNode):
+@@ -166,19 +166,19 @@ class RTSRoot(CFSNode):
              self._dbroot = self._default_dbroot
              return
          self._dbroot = fread(dbroot_path)
 -        if self._dbroot != self._preferred_dbroot:
 +        if self._dbroot != self._default_dbroot:
-             if len(FabricModule.list_registered_drivers()) != 0:
-                 # Writing to dbroot_path after drivers have been registered will make the kernel emit this error:
-                 # db_root: cannot be changed: target drivers registered
-                 from warnings import warn
-                 warn("Cannot set dbroot to {}. Target drivers have already been registered."
--                     .format(self._preferred_dbroot))
-+                     .format(self._default_dbroot))
-                 return
- 
              try:
 -                fwrite(dbroot_path, self._preferred_dbroot+"\n")
 +                fwrite(dbroot_path, self._default_dbroot+"\n")
@@ -26,6 +17,13 @@ index 2c5cf43..34bc57d 100644
                      raise RTSLibError("Cannot set dbroot to {}. Please check if this directory exists."
 -                                      .format(self._preferred_dbroot))
 +                                      .format(self._default_dbroot))
-             self._dbroot = fread(dbroot_path)
+                 else:
+                     # Writing to dbroot_path after devices have been registered will make the kernel emit this error:
+                     # db_root: cannot be changed: target devices registered
+                     from warnings import warn
+                     warn("Cannot set dbroot to {}. Target devices have already been registered."
+-                         .format(self._preferred_dbroot))
++                         .format(self._default_dbroot))
+                     return
  
-     def _get_dbroot(self):
+             self._dbroot = fread(dbroot_path)
diff --git a/python-rtslib.spec b/python-rtslib.spec
index 7f8498f..7d8858a 100644
--- a/python-rtslib.spec
+++ b/python-rtslib.spec
@@ -21,8 +21,8 @@ Name:             python-rtslib
 License:          ASL 2.0
 Group:            System Environment/Libraries
 Summary:          API for Linux kernel LIO SCSI target
-Version:          2.1.74
-Release:          1%{?dist}
+Version:          2.1.75
+Release:          4%{?dist}
 URL:              https://github.com/open-iscsi/%{oname}
 Source:           %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz
 Source1:          target.service
@@ -191,6 +191,19 @@ install -m 644 doc/saveconfig.json.5.gz %{buildroot}%{_mandir}/man5/
 %endif # with python2
 
 %changelog
+
+* Wed Jun 15 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.75-4
+- Updates to the gating tests from mhoyer
+
+* Wed Jun 15 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.75-3
+- Update the gating tests
+
+* Wed Jun 15 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.75-2
+- Fix the gating tests
+
+* Mon Jun 06 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.75-1
+- Update to the latest upstream version
+
 * Mon Oct 26 2020 Maurizio Lombardi <mlombard@redhat.com> - 2.1.74-1
 - Update to the latest upstream version
 
diff --git a/sources b/sources
index fd2ecf0..08434e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rtslib-fb-2.1.74.tar.gz) = 181b57f699dd4e6bc050585e1abffe75a7eaf5ae8325220d61d37f932912f2cec878c4643172c584f0d4c231441d25ff0e09aa1f48c2305061b75acdce051c86
+SHA512 (rtslib-fb-2.1.75.tar.gz) = 204729e779da1d0961ecff822c6ce914de5fa80e8159f440e0e69a7ba986da6d627a6377c143043d855bcaacaf086f4c73f3ccb4697dfaf061434c197ae24c3e