Hello community, here is the log from the commit of package python-rtslib for openSUSE:Factory checked in at 2016-06-19 10:47:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-rtslib (Old) and /work/SRC/openSUSE:Factory/.python-rtslib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-rtslib" Changes: -------- --- /work/SRC/openSUSE:Factory/python-rtslib/python-rtslib.changes 2016-01-05 21:55:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-rtslib.new/python-rtslib.changes 2016-06-19 10:47:54.000000000 +0200 @@ -1,0 +2,17 @@ +Sun Jun 12 08:18:24 UTC 2016 - [email protected] + +- Fix BNC#968745 - targetcli can create targets with uppercase + letters causing lio-utils problems +- Add patch: rtslib-disallow-upper-case-iqn-names.patch +------------------------------------------------------------------- +Fri May 13 02:44:37 UTC 2016 - [email protected] + +- Update to version 3.0 pre4 +- Remove rtslib-git-update.patch, because this package is already + updated to latest git release. +- Remove rtslib-add-iblock-backstore-policy.patch, because it is + already in version per4 release, and the values in + /policy/backstore_iblock.lio have been changed to the values + in the patch. +- Change version to 3.0pre4-suse +------------------------------------------------------------------- Old: ---- rtslib-2.2.tar.bz2 rtslib-add-iblock-backstore-policy.patch rtslib-git-update.patch New: ---- rtslib-3.0pre4.tar.gz rtslib-disallow-upper-case-iqn-names.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rtslib.spec ++++++ --- /var/tmp/diff_new_pack.Ez21Hs/_old 2016-06-19 10:47:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Ez21Hs/_new 2016-06-19 10:47:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-rtslib # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,22 +16,23 @@ # +%define oname rtslib + Name: python-rtslib -Version: 2.2 -Release: 0 -Summary: API for Linux kernel SCSI target (aka LIO) +Summary: A framework to implement simple but nice CLIs License: Apache-2.0 Group: Development/Languages/Python -%define oname rtslib +Version: 3.0pre4 +Release: 1%{?dist} Url: https://github.com/Datera/rtslib -# Source: https://github.com/Datera/%{oname}/archive/%{version}.tar.gz -Source: %{oname}-%{version}.tar.bz2 -Patch0: %{oname}-git-update.patch +Source: %{oname}-%{version}.tar.gz Patch1: %{oname}-set-git-version-for-sle12.patch Patch2: %{oname}-add-prot-info-attributes.patch -Patch3: %{oname}-add-iblock-backstore-policy.patch Patch5: 0001-Add-support-for-xen-scsiback.patch Patch6: %{oname}-fix-iqn-wwn.patch +Patch7: %{oname}-disallow-upper-case-iqn-names.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-configobj Requires: python-ipaddr Requires: python-netifaces @@ -42,16 +43,9 @@ BuildRequires: python-netifaces BuildRequires: python-pyparsing BuildRequires: python-setuptools -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: %{name}-doc = %{version} -Obsoletes: %{name}-doc < %{version} -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else -BuildArch: noarch -%endif %description +API for RisingTide Systems generic SCSI target. RTSlib is a Python library that provides an API to the LIO Linux SCSI Target, and its third-party target fabric modules and backend storage objects. @@ -60,68 +54,64 @@ userspace tools. For more information, please see the targetcli User's Guide at: - http://linux-iscsi.org/wiki/targetcli and the RTSlib API Reference Guide at: - http://linux-iscsi.org/Doc/rtslib/html http://linux-iscsi.org/Doc/rtslib/rtslib-API-reference.pdf + +%package doc +Summary: Documentatoin for Python rtslib-fb +Group: Documentation/HTML +BuildArch: noarch +BuildRequires: epydoc + +%description doc +This is the documents for python rtslib sub pacakge. + %prep %setup -q -n %{oname}-%{version} -%patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build -python setup.py build +%__python setup.py build +%__mkdir -p doc +epydoc --no-sourcecode --html -n %{oname} --exclude configobj %{oname}/*.py +%__mv html doc/ %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%__python setup.py install --skip-build --root %{buildroot} --prefix usr -%if 0%{?suse_version} < 1130 -# Workaround for FHS check -%define _vardir /var/lib/target -%else -%define _vardir /var/target -%endif - -install -vd -m 755 $RPM_BUILD_ROOT%{_vardir} -install -vd -m 755 $RPM_BUILD_ROOT%{_vardir}/pr -install -vd -m 755 $RPM_BUILD_ROOT%{_vardir}/alua -install -vd -m 755 $RPM_BUILD_ROOT%{_vardir}/fabric -install -v -m 644 specs/*.spec $RPM_BUILD_ROOT%{_vardir}/fabric/ -install -vd -m 755 $RPM_BUILD_ROOT%{_vardir}/policy -install -v -m 644 policy/*.lio $RPM_BUILD_ROOT%{_vardir}/policy/ - -%if 0%{?suse_version} < 1130 -%post -if test ! -e /var/target -then - ln -sfvn lib/target /var/target -fi - -%postun -if test "$1" = "0" -then - rm -fv /var/target -fi -%endif +%__install -d %{buildroot}%{_localstatedir}/target/pr +%__install -d %{buildroot}%{_localstatedir}/target/alua +%__install -d %{buildroot}%{_localstatedir}/target/fabric +%__install -m644 specs/*.spec %{buildroot}%{_localstatedir}/target/fabric +%__install -d %{buildroot}%{_localstatedir}/target/policy +%__install -m644 policy/*.lio %{buildroot}%{_localstatedir}/target/policy +%__install -d %{buildroot}%{_datadir}/doc/python-rtslib-doc-%{version} +%__cp -r doc/* specs/*.txt %{buildroot}%{_datadir}/doc/python-rtslib-doc-%{version}/ %files %defattr(-,root,root,-) -%doc README.md COPYING -%{python_sitelib}/* -%dir %{_vardir} -%dir %{_vardir}/pr -%dir %{_vardir}/alua -%dir %{_vardir}/fabric -%{_vardir}/fabric/* -%dir %{_vardir}/policy -%{_vardir}/policy/* +%{python_sitelib} +%{_localstatedir}/target + +%dir %{_localstatedir}/target/pr +%dir %{_localstatedir}/target/alua +%dir %{_localstatedir}/target/fabric +%{_localstatedir}/target/fabric/* +%dir %{_localstatedir}/target/policy +%{_localstatedir}/target/policy/* + +%doc COPYING README.md + +%files doc +%defattr(-,root,root,-) +%{_datadir}/doc/python-rtslib-doc-%{version} %changelog ++++++ rtslib-add-prot-info-attributes.patch ++++++ --- /var/tmp/diff_new_pack.Ez21Hs/_old 2016-06-19 10:47:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Ez21Hs/_new 2016-06-19 10:47:55.000000000 +0200 @@ -1,7 +1,7 @@ diff -aurp rtslib-2.2.orig/policy/backstore_fileio.lio rtslib-2.2/policy/backstore_fileio.lio --- rtslib-2.2.orig/policy/backstore_fileio.lio 2014-06-26 11:43:19.659423631 -0700 +++ rtslib-2.2/policy/backstore_fileio.lio 2014-06-26 11:41:47.503419450 -0700 -@@ -23,6 +23,8 @@ storage fileio disk %str { +@@ -24,6 +24,8 @@ storage fileio disk %str { max_unmap_lba_count %int(8192) max_write_same_len %int(4096) optimal_sectors %int(8192) @@ -13,26 +13,26 @@ diff -aurp rtslib-2.2.orig/policy/backstore_ramdisk.lio rtslib-2.2/policy/backstore_ramdisk.lio --- rtslib-2.2.orig/policy/backstore_ramdisk.lio 2014-06-26 11:43:19.659423631 -0700 +++ rtslib-2.2/policy/backstore_ramdisk.lio 2014-06-26 11:41:47.503419450 -0700 -@@ -22,6 +22,8 @@ storage rd_mcp disk %str { - max_unmap_lba_count %bool(no) +@@ -23,6 +23,8 @@ storage rd_mcp disk %str { + max_unmap_lba_count %int(0) max_write_same_len %int(0) - optimal_sectors %int(1024) -+ pi_prot_format %bool(no) -+ pi_prot_type %int(0) - queue_depth %int(32) - unmap_granularity %bool(no) - unmap_granularity_alignment %bool(no) + optimal_sectors %int(8192) ++ pi_prot_format %bool(no) ++ pi_prot_type %int(0) + queue_depth %int(128) + unmap_granularity %int(0) + unmap_granularity_alignment %int(0) diff -aurp rtslib-2.2.orig/policy/fabric_ib_srpt.lio rtslib-2.2/policy/fabric_ib_srpt.lio --- rtslib-2.2.orig/policy/fabric_ib_srpt.lio 2014-06-26 11:43:19.659423631 -0700 +++ rtslib-2.2/policy/fabric_ib_srpt.lio 2014-06-26 11:42:27.007421242 -0700 -@@ -39,6 +39,7 @@ fabric ib_srpt { - login_timeout %int(15) - netif_timeout %int(2) - prod_mode_write_protect %bool(no) -+ t10_pi %bool(no) +@@ -4,6 +4,7 @@ fabric ib_srpt { + mapped_lun %int { + target_lun @(-3 lun) + write_protect %bool(no) ++ t10_pi %bool(no) + } } - lun %int backend %backend - parameter { + attribute { diff -aurp rtslib-2.2.orig/policy/fabric_iscsi.lio rtslib-2.2/policy/fabric_iscsi.lio --- rtslib-2.2.orig/policy/fabric_iscsi.lio 2014-06-26 11:43:19.663423631 -0700 +++ rtslib-2.2/policy/fabric_iscsi.lio 2014-06-26 11:42:27.007421242 -0700 ++++++ rtslib-disallow-upper-case-iqn-names.patch ++++++ diff -aurp rtslib-2.2.orig/rtslib/target.py rtslib-2.2/rtslib/target.py --- rtslib-2.2.orig/rtslib/target.py 2016-04-27 15:43:36.324000000 -0700 +++ rtslib-2.2/rtslib/target.py 2016-04-27 15:44:20.900000000 -0700 @@ -1208,10 +1208,9 @@ class Target(CFSNode): self.wwn = wwn self._path = "%s/%s" % (self.fabric_module.path, self.wwn) - if not self: - if not self.fabric_module.is_valid_wwn(self.wwn): - raise RTSLibError("Invalid %s wwn: %s" - % (self.wwn_type, self.wwn)) + if not self.fabric_module.is_valid_wwn(self.wwn): + raise RTSLibError("Invalid %s wwn: %s" + % (self.wwn_type, self.wwn)) self._create_in_cfs_ine(mode) def _list_tpgs(self): diff -aurp rtslib-2.2.orig/rtslib/utils.py rtslib-2.2/rtslib/utils.py --- rtslib-2.2.orig/rtslib/utils.py 2016-04-27 15:43:36.380000000 -0700 +++ rtslib-2.2/rtslib/utils.py 2016-04-27 15:44:20.904000000 -0700 @@ -557,7 +557,8 @@ def is_valid_wwn(wwn_type, wwn, wwn_list elif wwn_type == 'iqn' \ and re.match("iqn\.[0-9]{4}-[0-1][0-9]\..*\..*", wwn) \ and not re.search(' ', wwn) \ - and not re.search('_', wwn): + and not re.search('_', wwn) \ + and not re.search('[A-Z]', wwn): return True elif wwn_type == 'naa' \ and re.match("naa\.[0-9A-Fa-f]{16}$", wwn): ++++++ rtslib-set-git-version-for-sle12.patch ++++++ --- /var/tmp/diff_new_pack.Ez21Hs/_old 2016-06-19 10:47:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Ez21Hs/_new 2016-06-19 10:47:55.000000000 +0200 @@ -6,7 +6,7 @@ from config_parser import ConfigParser, PolicyParser, PatternParser -__version__ = 'GIT_VERSION' -+__version__ = '2.2-sle12' ++__version__ = '3.0pre4-suse' __author__ = "Jerome Martin <[email protected]>" __url__ = "http://www.risingtidesystems.com"; __description__ = "API for RisingTide Systems generic SCSI target."
