diff --git a/_service b/_service index 1d8c059..08804ed 100644 --- a/_service +++ b/_service @@ -1,21 +1,24 @@ git - https://github.com/hreinecke/sg3_utils.git + https://github.com/openSUSE/sg3_utils.git sg3_utils - 1.43 + + 1.45@PARENT_TAG@+@TAG_OFFSET@.%h + r[0-9]* + + (1\.[0-9]*)r([0-9]*) + \1~\2 factory - - *sg3_utils*.tar xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..18f91e4 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/openSUSE/sg3_utils.git + 564be3d665882df5439e12c6a611487feb7310d6 \ No newline at end of file diff --git a/sg3_utils-1.43.tar.xz b/sg3_utils-1.43.tar.xz deleted file mode 100644 index 4befc6f..0000000 --- a/sg3_utils-1.43.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f5cf67105fb300b9f75df3b9f0002c0cefd283ae1d9eaacd4fd66c0ff726270 -size 895840 diff --git a/sg3_utils-1.45~803+31.564be3d.tar.xz b/sg3_utils-1.45~803+31.564be3d.tar.xz new file mode 100644 index 0000000..10c6b1f --- /dev/null +++ b/sg3_utils-1.45~803+31.564be3d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a9268c1f5807944d385944a64f3af5d4391a5a459984607783ff2d519b0d479 +size 939944 diff --git a/sg3_utils.changes b/sg3_utils.changes index 4a4e34c..b4b0bb0 100644 --- a/sg3_utils.changes +++ b/sg3_utils.changes @@ -1,3 +1,60 @@ +------------------------------------------------------------------- +Tue Mar 26 22:11:38 UTC 2019 - mwilck@suse.com + +- Spec file: + * add fc_wwpn_id (bsc#1005063) + * add lun masking service (bsc#954600) + * drop BuildRequires on udev + * replace unversioned "Provides: scsi" with versioned + +- Update to version sg3_utils-1.45~803+31.564be3d: + * New versioning scheme for upstream pre-release: + 1.45 - upstream release target, 803 - upstream svn id, + +31: SUSE commits on top of svn, 564be3d - git hash + * rescan-scsi-bus.sh: terminate scanning if last lun got removed + (bsc#1087008) + * 58-scsi-sg3_symlink.rules: don't skip multipath members + (bsc#1085212) + * Add scsi-enable-target-scan.sh (bsc#954600) + +- Update to svn r803: + * sg_opcodes: expand MLU (18-102r0) + * sg_format: add --dcrt used twice (FOV=1 DCRT=0) + * rescan-scsi-bus: widen LUN 0 only scanning + (bsc#1069384) +- Earlier SUSE fixes included in 1.45: + * rescan-scsi-bus.sh: use LUN wildcard in idlist (bsc#1069384) + [svn: r795] + * sg_ses: fixup page decoding (bsc#1077787) [svn: r795] + * sg_ses: allow to decode raw data instead of reading from a device + (bsc#1050943) [svn: r795] + +- Update to sg3_utils-1.44 [20180912] [svn: r791] + * rescan-scsi-bus.sh: harden code + - bump version to 20180615 + - add --ignore-rev to ignore revision change + * introduce SG3_UTILS_DSENSE environment variable + * sginfo: don't open /dev/snapshot + * sg_timestamp: add '--no-timestamp' option + - add --elapsed and --hex options + * sg_wr_mode: add --rtd option for RTD bi + * sg_unmap: add --all=ST,RN[,LA] option + * sgm_dd, sg_dd: add --dry-run and --verbose options + * sg_inq+sg_vpd: update Extended inquiry data vpd page + * sg_ses: add 'hw_reset' and 'sw_reset' to enclosure services + controller electronics element type (18-047r1) + * sg_decode sense: add --cdb and --err=ES options + * sg_format: add --dry-run option + - extend --wait timeout for > 4TB disks + * sg_sanitize: add --dry-run option +- Earlier SUSE fixes included in 1.44: + * sg_inq: decode standard INQUIRY for CD-ROMs correctly + (bsc#1065448, bsc#1070431) [svn: r742] + * sg_inq: export all NAA values (bsc#1050767) [svn: r715] + * Add fc_wwpn_id to generate by-path links for fibrechannel + (bsc#1005063) (svn@715) + * sg_vpd: struct opts_t misaligment (bsc#1050943) [svn: r707] + ------------------------------------------------------------------- Fri Apr 6 12:40:40 CEST 2018 - hare@suse.de diff --git a/sg3_utils.spec b/sg3_utils.spec index 6556f3c..643634c 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -1,7 +1,7 @@ # # spec file for package sg3_utils # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,16 +12,16 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: sg3_utils -%define lname libsgutils2-1_43-2 -Version: 1.43 +%define lname libsgutils2-1_45-2 +Version: 1.45~803+31.564be3d Release: 0 Summary: A collection of tools that send SCSI commands to devices -License: GPL-2.0+ and BSD-3-Clause +License: GPL-2.0-or-later AND BSD-3-Clause Group: Hardware/Other Url: http://sg.danny.cz/sg/sg3_utils.html @@ -29,10 +29,10 @@ Source: sg3_utils-%{version}.tar.xz Source1: dracut.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libtool -BuildRequires: udev +BuildRequires: systemd-rpm-macros BuildRequires: xz Requires(post): coreutils -Provides: scsi +Provides: scsi = %{version} Provides: sg_utils Supplements: modalias(scsi:t-0x00*) Supplements: modalias(scsi:t-0x07*) @@ -99,20 +99,33 @@ install -m 644 scripts/54-before-scsi-sg3_id.rules $RPM_BUILD_ROOT%{_udevrulesdi install -m 644 scripts/55-scsi-sg3_id.rules $RPM_BUILD_ROOT%{_udevrulesdir} install -m 644 scripts/58-scsi-sg3_symlink.rules $RPM_BUILD_ROOT%{_udevrulesdir} install -m 644 scripts/40-usb-blacklist.rules $RPM_BUILD_ROOT%{_udevrulesdir} +install -m 644 scripts/59-fc-wwpn-id.rules $RPM_BUILD_ROOT%{_udevrulesdir} +install -m 755 scripts/fc_wwpn_id $RPM_BUILD_ROOT%{_udevrulesdir}/.. mkdir -p $RPM_BUILD_ROOT/usr/lib/dracut/dracut.conf.d install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/dracut/dracut.conf.d/50-sg3_utils.conf +mkdir -p $RPM_BUILD_ROOT%{_unitdir} +install -m 644 scripts/lunmask.service $RPM_BUILD_ROOT%{_unitdir} +mkdir -p $RPM_BUILD_ROOT%{_unitdir}/../scripts +install -m 755 scripts/scsi-enable-target-scan.sh $RPM_BUILD_ROOT%{_unitdir}/../scripts rm -f %{buildroot}%{_libdir}/*.la +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig + +%pre +%service_add_pre lunmask.service + %post +%service_add_post lunmask.service %{?regenerate_initrd_post} -%post -p /sbin/ldconfig -n %lname +%preun +%service_del_preun lunmask.service %postun +%service_del_postun lunmask.service %{?regenerate_initrd_post} -%postun -p /sbin/ldconfig -n %lname - %posttrans %{?regenerate_initrd_posttrans} @@ -125,16 +138,22 @@ rm -f %{buildroot}%{_libdir}/*.la %_bindir/sginfo %_bindir/sgp_dd %_bindir/sgm_dd -%_bindir/scsi_logging_level %_bindir/rescan-scsi-bus.sh %_mandir/man8/*.8* +%dir /usr/lib/udev +%dir %{_udevrulesdir} %{_udevrulesdir}/40-usb-blacklist.rules %{_udevrulesdir}/54-before-scsi-sg3_id.rules %{_udevrulesdir}/55-scsi-sg3_id.rules %{_udevrulesdir}/58-scsi-sg3_symlink.rules +%{_udevrulesdir}/59-fc-wwpn-id.rules +%{_udevrulesdir}/../fc_wwpn_id %dir /usr/lib/dracut %dir /usr/lib/dracut/dracut.conf.d /usr/lib/dracut/dracut.conf.d/50-sg3_utils.conf +%dir %{_unitdir}/../scripts +%{_unitdir}/../scripts/scsi-enable-target-scan.sh +%{_unitdir}/lunmask.service %files -n %lname %defattr(-,root,root)