From aef77f210453ce661aeb80536cb90e6b7ca5c3e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:05:38 +0000 Subject: [PATCH 1/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sg3_utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sg3_utils.spec b/sg3_utils.spec index 8e41b4f..e7173da 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -3,7 +3,7 @@ Summary: Utilities for devices that use SCSI command sets Name: sg3_utils Version: 1.46 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and BSD Source0: http://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz Source2: scsi-rescan.8 @@ -98,6 +98,9 @@ install -p -m 755 scripts/fc_wwpn_id $RPM_BUILD_ROOT/usr/lib/udev %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.46-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.46-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 5549d7d57243ac8a166b8f077cb1891c6af19626 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:30:29 +0000 Subject: [PATCH 2/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sg3_utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sg3_utils.spec b/sg3_utils.spec index e7173da..4237086 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -3,7 +3,7 @@ Summary: Utilities for devices that use SCSI command sets Name: sg3_utils Version: 1.46 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ and BSD Source0: http://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz Source2: scsi-rescan.8 @@ -98,6 +98,9 @@ install -p -m 755 scripts/fc_wwpn_id $RPM_BUILD_ROOT/usr/lib/udev %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.46-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.46-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 187ccad96a050e88da43ca08b6034faddc1b9278 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:46:33 +0000 Subject: [PATCH 3/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- sg3_utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sg3_utils.spec b/sg3_utils.spec index 4237086..ca373a8 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -3,7 +3,7 @@ Summary: Utilities for devices that use SCSI command sets Name: sg3_utils Version: 1.46 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ and BSD Source0: http://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz Source2: scsi-rescan.8 @@ -98,6 +98,9 @@ install -p -m 755 scripts/fc_wwpn_id $RPM_BUILD_ROOT/usr/lib/udev %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.46-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.46-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From f9a9f881043d4b8b83a45907efc4127de360f4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 9 Feb 2024 14:20:47 +0100 Subject: [PATCH 4/9] - update to version 1.48 (rhbz#1944444) --- .gitignore | 1 + sg3_utils.spec | 72 ++++++++++++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 49 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 27f7c31..a23f508 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ rescan-scsi-bus.sh-1.35 /sg3_utils-1.44.tar.xz /sg3_utils-1.45.tar.xz /sg3_utils-1.46.tar.xz +/sg3_utils-1.48.tar.xz diff --git a/sg3_utils.spec b/sg3_utils.spec index ca373a8..5737944 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -1,14 +1,15 @@ %global rescan_script rescan-scsi-bus.sh +%global _udevlibdir %{_prefix}/lib/udev Summary: Utilities for devices that use SCSI command sets -Name: sg3_utils -Version: 1.46 -Release: 7%{?dist} -License: GPLv2+ and BSD -Source0: http://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz -Source2: scsi-rescan.8 +Name: sg3_utils +Version: 1.48 +Release: 1%{?dist} +License: GPL-2.0-or-later AND BSD-2-Clause +URL: https://sg.danny.cz/sg/sg3_utils.html +Source0: https://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz +Source1: scsi-rescan.8 -URL: http://sg.danny.cz/sg/sg3_utils.html Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: make BuildRequires: gcc @@ -43,9 +44,11 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} This package contains the %{name} library and its header files for developing applications. + %prep %autosetup -p 1 + %build %configure --disable-static @@ -58,46 +61,65 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %install %make_install -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la +rm -rf %{buildroot}%{_libdir}/*.la -install -p -m 755 scripts/%{rescan_script} $RPM_BUILD_ROOT%{_bindir} -( cd $RPM_BUILD_ROOT%{_bindir}; ln -sf %{rescan_script} scsi-rescan ) +install -p -m 755 scripts/%{rescan_script} %{buildroot}%{_bindir} +( cd %{buildroot}%{_bindir}; ln -sf %{rescan_script} scsi-rescan ) -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8 +install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man8 # install all extra udev rules -mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir} -mkdir -p $RPM_BUILD_ROOT/usr/lib/udev -install -p -m 644 scripts/40-usb-blacklist.rules $RPM_BUILD_ROOT%{_udevrulesdir} +mkdir -p %{buildroot}%{_udevrulesdir} +mkdir -p %{buildroot}%{_udevlibdir} +install -p -m 644 scripts/40-usb-blacklist.rules %{buildroot}%{_udevrulesdir} # need to run after 60-persistent-storage.rules -install -p -m 644 scripts/55-scsi-sg3_id.rules $RPM_BUILD_ROOT%{_udevrulesdir}/61-scsi-sg3_id.rules +install -p -m 644 scripts/55-scsi-sg3_id.rules %{buildroot}%{_udevrulesdir}/61-scsi-sg3_id.rules # need to run after 62-multipath.rules -install -p -m 644 scripts/58-scsi-sg3_symlink.rules $RPM_BUILD_ROOT%{_udevrulesdir}/63-scsi-sg3_symlink.rules -install -p -m 644 scripts/59-scsi-cciss_id.rules $RPM_BUILD_ROOT%{_udevrulesdir}/65-scsi-cciss_id.rules -install -p -m 644 scripts/59-fc-wwpn-id.rules $RPM_BUILD_ROOT%{_udevrulesdir}/63-fc-wwpn-id.rules -install -p -m 755 scripts/fc_wwpn_id $RPM_BUILD_ROOT/usr/lib/udev +install -p -m 644 scripts/58-scsi-sg3_symlink.rules %{buildroot}%{_udevrulesdir}/63-scsi-sg3_symlink.rules +install -p -m 644 scripts/59-scsi-cciss_id.rules %{buildroot}%{_udevrulesdir}/65-scsi-cciss_id.rules +install -p -m 644 scripts/59-fc-wwpn-id.rules %{buildroot}%{_udevrulesdir}/63-fc-wwpn-id.rules +install -p -m 755 scripts/fc_wwpn_id %{buildroot}%{_udevlibdir} + %files -%doc AUTHORS BSD_LICENSE COPYING COVERAGE CREDITS ChangeLog README README.sg_start -%{_bindir}/* -%{_mandir}/man8/* +%license BSD_LICENSE COPYING +%doc AUTHORS COVERAGE CREDITS ChangeLog README README.sg_start +%{_bindir}/scsi_* +%{_bindir}/sg_* +%{_bindir}/rescan-scsi-bus.sh +%{_bindir}/scsi-rescan +%{_bindir}/sginfo +%{_bindir}/sgm_dd +%{_bindir}/sgp_dd +%{_mandir}/man8/scsi_*.8* +%{_mandir}/man8/sg_*.8* +%{_mandir}/man8/rescan-scsi-bus.sh.8* +%{_mandir}/man8/scsi-rescan.8* +%{_mandir}/man8/sginfo.8* +%{_mandir}/man8/sgm_dd.8* +%{_mandir}/man8/sgp_dd.8* +%{_mandir}/man8/%{name}.8* +%{_mandir}/man8/%{name}_json.8* %{_udevrulesdir}/61-scsi-sg3_id.rules %{_udevrulesdir}/63-scsi-sg3_symlink.rules %{_udevrulesdir}/63-fc-wwpn-id.rules %{_udevrulesdir}/65-scsi-cciss_id.rules %{_udevrulesdir}/40-usb-blacklist.rules -/usr/lib/udev/fc_wwpn_id +%{_udevlibdir}/fc_wwpn_id %files libs %doc BSD_LICENSE COPYING -%{_libdir}/*.so.* +%{_libdir}/libsgutils2-%{version}.so.* %files devel %{_includedir}/scsi/*.h -%{_libdir}/*.so +%{_libdir}/libsgutils2.so %changelog +* Fri Feb 09 2024 Dan Horák - 1.48-1 +- update to version 1.48 (rhbz#1944444) + * Sat Jan 27 2024 Fedora Release Engineering - 1.46-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index bea802b..77279e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sg3_utils-1.46.tar.xz) = 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf +SHA512 (sg3_utils-1.48.tar.xz) = d4f586ac8a4ba9b5de5885657785e25251c8a42913332d6eca38f92b546c06e8e8aa0553c4b5c04f553cf2d0a9e4f34827f65ba596ef65e43dec36b4345f444a From 52ec43c3a6525bdb8a40ff8637368773fa7344ce Mon Sep 17 00:00:00 2001 From: Xose Vazquez Perez Date: Mon, 8 Apr 2024 15:53:17 +0200 Subject: [PATCH 5/9] fix three bugs in scripts/rescan-scsi-bus.sh from upstream --- ...sh-fix-multipath-resize-without-upda.patch | 27 +++++++++ ...sh-remove-tmp-rescan-scsi-mpath-info.patch | 58 +++++++++++++++++++ ...sh-fix-for-github.com-doug-gilbert-s.patch | 30 ++++++++++ sg3_utils.spec | 14 ++++- 4 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 0001-rescan-scsi-bus.sh-fix-multipath-resize-without-upda.patch create mode 100644 0002-rescan-scsi-bus.sh-remove-tmp-rescan-scsi-mpath-info.patch create mode 100644 0003-rescan-scsi-bus.sh-fix-for-github.com-doug-gilbert-s.patch diff --git a/0001-rescan-scsi-bus.sh-fix-multipath-resize-without-upda.patch b/0001-rescan-scsi-bus.sh-fix-multipath-resize-without-upda.patch new file mode 100644 index 0000000..ab0c83b --- /dev/null +++ b/0001-rescan-scsi-bus.sh-fix-multipath-resize-without-upda.patch @@ -0,0 +1,27 @@ +From 89427a6328a737b6a64104a6988e4ab319f239c7 Mon Sep 17 00:00:00 2001 +From: Douglas Gilbert +Date: Mon, 16 Oct 2023 14:59:21 +0000 +Subject: [PATCH 1/3] rescan-scsi-bus.sh: fix multipath resize without update, + https://github.com/doug-gilbert/sg3_utils/pull/43.diff +X-Patchwork-Bot: notify + +git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@1055 6180dd3e-e324-4e3e-922d-17de1ae2f315 +--- + scripts/rescan-scsi-bus.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh +index 0c25dbb1..7d74d90f 100755 +--- a/scripts/rescan-scsi-bus.sh ++++ b/scripts/rescan-scsi-bus.sh +@@ -1088,6 +1088,7 @@ findresized() + local mpathsize= + declare -a mpathsizes + ++ [ -e "$TMPLUNINFOFILE" ] || getallmultipathinfo + if [ -z "$lunsearch" ] ; then + devs=$(ls /sys/class/scsi_device/) + else +-- +2.44.0 + diff --git a/0002-rescan-scsi-bus.sh-remove-tmp-rescan-scsi-mpath-info.patch b/0002-rescan-scsi-bus.sh-remove-tmp-rescan-scsi-mpath-info.patch new file mode 100644 index 0000000..a17317a --- /dev/null +++ b/0002-rescan-scsi-bus.sh-remove-tmp-rescan-scsi-mpath-info.patch @@ -0,0 +1,58 @@ +From 593cb078d4e91591aa3be823715f11888b21f8e4 Mon Sep 17 00:00:00 2001 +From: Douglas Gilbert +Date: Tue, 17 Oct 2023 20:41:37 +0000 +Subject: [PATCH 2/3] rescan-scsi-bus.sh: remove + /tmp/rescan-scsi-mpath-info.txt; + https://github.com/doug-gilbert/sg3_utils/pull/44.diff +X-Patchwork-Bot: notify + +git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@1056 6180dd3e-e324-4e3e-922d-17de1ae2f315 +--- + scripts/rescan-scsi-bus.sh | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh +index 7d74d90f..188d071c 100755 +--- a/scripts/rescan-scsi-bus.sh ++++ b/scripts/rescan-scsi-bus.sh +@@ -7,7 +7,16 @@ + VERSION="20230413" + SCAN_WILD_CARD=4294967295 + +-TMPLUNINFOFILE="/tmp/rescan-scsi-mpath-info.txt" ++CLEANUP=: ++trap 'eval "$CLEANUP"' 0 ++TMPD=$(mktemp -d /tmp/rsb.XXXXXXXX) ++[ "$TMPD" ] || { ++ echo failed to create temporary directory >&2 ++ exit 1 ++} ++CLEANUP='rm -rf "$TMPD";'"$CLEANUP" ++ ++TMPLUNINFOFILE="$TMPD/rescan-scsi-mpath-info.txt" + + setcolor () + { +@@ -818,9 +827,9 @@ findremapped() + mpaths="" + local tmpfile= + +- tmpfile=$(mktemp /tmp/rescan-scsi-bus.XXXXXXXX 2> /dev/null) ++ tmpfile=$(mktemp "$TMPD/rescan-scsi-bus.XXXXXXXX" 2> /dev/null) + if [ -z "$tmpfile" ] ; then +- tmpfile="/tmp/rescan-scsi-bus.$$" ++ tmpfile="$TMPD/rescan-scsi-bus.$$" + rm -f $tmpfile + fi + +@@ -874,7 +883,6 @@ findremapped() + echo "$SCSISTR" + incrchgd "$hctl" + done < $tmpfile +- rm -f $tmpfile + + if [ -n "$mp_enable" ] && [ -n "$mpaths" ] ; then + echo "Updating multipath device mappings" +-- +2.44.0 + diff --git a/0003-rescan-scsi-bus.sh-fix-for-github.com-doug-gilbert-s.patch b/0003-rescan-scsi-bus.sh-fix-for-github.com-doug-gilbert-s.patch new file mode 100644 index 0000000..3f8caa9 --- /dev/null +++ b/0003-rescan-scsi-bus.sh-fix-for-github.com-doug-gilbert-s.patch @@ -0,0 +1,30 @@ +From bc99b8db2cf8afd04b1f9d68e9bd4f9d847b3c6f Mon Sep 17 00:00:00 2001 +From: Douglas Gilbert +Date: Thu, 21 Dec 2023 04:35:26 +0000 +Subject: [PATCH 3/3] rescan-scsi-bus.sh: fix for + github.com/doug-gilbert/sg3_utils/issues/46 +X-Patchwork-Bot: notify + +git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@1076 6180dd3e-e324-4e3e-922d-17de1ae2f315 +--- + scripts/rescan-scsi-bus.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh +index 188d071c..52991e1e 100755 +--- a/scripts/rescan-scsi-bus.sh ++++ b/scripts/rescan-scsi-bus.sh +@@ -1240,7 +1240,9 @@ if [ -x /usr/bin/sg_inq ] ; then + if [ "$sg_turs_version" -gt 353 ] ; then + sg_turs_opt="--ascq=0x3a" + else +- sg_turs_opt="" ++ # Not really interested in timing a TUR but an empty string such as ++ # "" gets interpreted on the command line as a positional parameter. ++ sg_turs_opt="-t" + fi + else + echo "WARN: /usr/bin/sg_inq not present -- please install sg3_utils" +-- +2.44.0 + diff --git a/sg3_utils.spec b/sg3_utils.spec index 5737944..9897adb 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -4,11 +4,20 @@ Summary: Utilities for devices that use SCSI command sets Name: sg3_utils Version: 1.48 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later AND BSD-2-Clause URL: https://sg.danny.cz/sg/sg3_utils.html Source0: https://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz Source1: scsi-rescan.8 +# https://github.com/doug-gilbert/sg3_utils/pull/43 +# scripts/rescan-scsi-bus.sh: fix multipath resize without update +Patch0: 0001-rescan-scsi-bus.sh-fix-multipath-resize-without-upda.patch +# https://github.com/doug-gilbert/sg3_utils/pull/44 +# scripts/rescan-scsi-bus.sh: remove /tmp/rescan-scsi-mpath-info.txt +Patch1: 0002-rescan-scsi-bus.sh-remove-tmp-rescan-scsi-mpath-info.patch +# https://github.com/doug-gilbert/sg3_utils/issues/46 +# scripts/rescan-scsi-bus.sh: -r flag unmounts active root disk +Patch2: 0003-rescan-scsi-bus.sh-fix-for-github.com-doug-gilbert-s.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: make @@ -117,6 +126,9 @@ install -p -m 755 scripts/fc_wwpn_id %{buildroot}%{_udevlibdir} %changelog +* Mon Apr 8 2024 Xose Vazquez Perez - 1.48-2 +- fix three bugs in scripts/rescan-scsi-bus.sh from upstream + * Fri Feb 09 2024 Dan Horák - 1.48-1 - update to version 1.48 (rhbz#1944444) From ae2dddd56b1551878db5a7b2c4cc3e767d6257b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:21:35 +0000 Subject: [PATCH 6/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sg3_utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sg3_utils.spec b/sg3_utils.spec index 9897adb..bd3b0d2 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for devices that use SCSI command sets Name: sg3_utils Version: 1.48 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later AND BSD-2-Clause URL: https://sg.danny.cz/sg/sg3_utils.html Source0: https://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz @@ -126,6 +126,9 @@ install -p -m 755 scripts/fc_wwpn_id %{buildroot}%{_udevlibdir} %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.48-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Apr 8 2024 Xose Vazquez Perez - 1.48-2 - fix three bugs in scripts/rescan-scsi-bus.sh from upstream From 9d29ec19b2778c164f1ca83b35d3e073ae0df5da Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Fri, 1 Nov 2024 17:50:06 +0100 Subject: [PATCH 7/9] * Fri Nov 01 2024 Tomas Bzatek - 1.48-4 - udev rules: avoid spurious warning for non-SCSI devices - Install missing 00-scsi-sg3_config.rules - Fix file references to other udev rules --- sg3_utils.spec | 17 ++++++++++- ...purious_warning_for_non-SCSI_devices.patch | 29 +++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch diff --git a/sg3_utils.spec b/sg3_utils.spec index bd3b0d2..4c3ebe1 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for devices that use SCSI command sets Name: sg3_utils Version: 1.48 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later AND BSD-2-Clause URL: https://sg.danny.cz/sg/sg3_utils.html Source0: https://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz @@ -18,6 +18,8 @@ Patch1: 0002-rescan-scsi-bus.sh-remove-tmp-rescan-scsi-mpath-info.patch # https://github.com/doug-gilbert/sg3_utils/issues/46 # scripts/rescan-scsi-bus.sh: -r flag unmounts active root disk Patch2: 0003-rescan-scsi-bus.sh-fix-for-github.com-doug-gilbert-s.patch +# https://github.com/doug-gilbert/sg3_utils/pull/47 +Patch3: udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: make @@ -65,6 +67,12 @@ developing applications. sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +# Fix filename references to other udev rules +sed -i 's|55-scsi-sg3_id.rules|61-scsi-sg3_id.rules|' scripts/*.rules +sed -i 's|58-scsi-sg3_symlink.rules|63-scsi-sg3_symlink.rules|' scripts/*.rules +sed -i 's|59-scsi-cciss_id.rules|65-scsi-cciss_id.rules|' scripts/*.rules +sed -i 's|59-fc-wwpn-id.rules|63-fc-wwpn-id.rules|' scripts/*.rules + %make_build @@ -80,6 +88,7 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man8 # install all extra udev rules mkdir -p %{buildroot}%{_udevrulesdir} mkdir -p %{buildroot}%{_udevlibdir} +install -p -m 644 scripts/00-scsi-sg3_config.rules %{buildroot}%{_udevrulesdir} install -p -m 644 scripts/40-usb-blacklist.rules %{buildroot}%{_udevrulesdir} # need to run after 60-persistent-storage.rules install -p -m 644 scripts/55-scsi-sg3_id.rules %{buildroot}%{_udevrulesdir}/61-scsi-sg3_id.rules @@ -109,6 +118,7 @@ install -p -m 755 scripts/fc_wwpn_id %{buildroot}%{_udevlibdir} %{_mandir}/man8/sgp_dd.8* %{_mandir}/man8/%{name}.8* %{_mandir}/man8/%{name}_json.8* +%{_udevrulesdir}/00-scsi-sg3_config.rules %{_udevrulesdir}/61-scsi-sg3_id.rules %{_udevrulesdir}/63-scsi-sg3_symlink.rules %{_udevrulesdir}/63-fc-wwpn-id.rules @@ -126,6 +136,11 @@ install -p -m 755 scripts/fc_wwpn_id %{buildroot}%{_udevlibdir} %changelog +* Fri Nov 01 2024 Tomas Bzatek - 1.48-4 +- udev rules: avoid spurious warning for non-SCSI devices +- Install missing 00-scsi-sg3_config.rules +- Fix file references to other udev rules + * Sat Jul 20 2024 Fedora Release Engineering - 1.48-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch b/udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch new file mode 100644 index 0000000..bd65db1 --- /dev/null +++ b/udev_rules-avoid_spurious_warning_for_non-SCSI_devices.patch @@ -0,0 +1,29 @@ +From 4957a561867b4f363b0711bb5e0a3292f3067ce7 Mon Sep 17 00:00:00 2001 +From: Martin Wilck +Date: Tue, 9 Jan 2024 22:10:09 +0100 +Subject: [PATCH] udev rules: avoid spurious warning for non-SCSI devices + +The udev rules spit out lots of warnings like this: + +55-scsi-sg3_id.rules[15445]: WARNING: SCSI device loop0 has no device ID, consider changing .SCSI_ID_SERIAL_SRC in 00-scsi-sg3_config.rules + +Because the warning code had erroneously been inserted in the +"sg3_utils_id_end" clause. Fix it. + +Fixes: d7b8da0 ("udev rules: restrict use of ambiguous device IDs patchset") +--- + scripts/55-scsi-sg3_id.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/55-scsi-sg3_id.rules b/scripts/55-scsi-sg3_id.rules +index 5e9732d6..f3ddb065 100644 +--- a/scripts/55-scsi-sg3_id.rules ++++ b/scripts/55-scsi-sg3_id.rules +@@ -147,6 +147,6 @@ ENV{SCSI_IDENT_SERIAL}=="?*", ENV{.SCSI_ID_SERIAL_SRC}=="*S*", \ + ENV{ID_SERIAL}="S$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_SERIAL}", \ + ENV{ID_SERIAL_SHORT}="$env{SCSI_IDENT_SERIAL}" + +-LABEL="sg3_utils_id_end" + ENV{ID_SERIAL}!="?*", ENV{DEVTYPE}=="disk", \ + PROGRAM="/bin/logger -t 55-scsi-sg3_id.rules -p daemon.warning \"WARNING: SCSI device %k has no device ID, consider changing .SCSI_ID_SERIAL_SRC in 00-scsi-sg3_config.rules\"" ++LABEL="sg3_utils_id_end" From 9e81f4315bde8a98af3808dae61650be2d4601f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:30:54 +0000 Subject: [PATCH 8/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sg3_utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sg3_utils.spec b/sg3_utils.spec index 4c3ebe1..f5d28af 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for devices that use SCSI command sets Name: sg3_utils Version: 1.48 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later AND BSD-2-Clause URL: https://sg.danny.cz/sg/sg3_utils.html Source0: https://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz @@ -136,6 +136,9 @@ install -p -m 755 scripts/fc_wwpn_id %{buildroot}%{_udevlibdir} %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.48-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 01 2024 Tomas Bzatek - 1.48-4 - udev rules: avoid spurious warning for non-SCSI devices - Install missing 00-scsi-sg3_config.rules From dc8b19c8ee37e0596c446b334935dc197c6dadda Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:12:13 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sg3_utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sg3_utils.spec b/sg3_utils.spec index f5d28af..d38a63d 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for devices that use SCSI command sets Name: sg3_utils Version: 1.48 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later AND BSD-2-Clause URL: https://sg.danny.cz/sg/sg3_utils.html Source0: https://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz @@ -136,6 +136,9 @@ install -p -m 755 scripts/fc_wwpn_id %{buildroot}%{_udevlibdir} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.48-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.48-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild