diff --git a/.gitignore b/.gitignore index ea75485..1707c22 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/lsscsi-0.32.tgz +lsscsi-0.32.tgz diff --git a/.lsscsi.metadata b/.lsscsi.metadata deleted file mode 100644 index a59724f..0000000 --- a/.lsscsi.metadata +++ /dev/null @@ -1 +0,0 @@ -2660fb6e16d2128869e89cd353d37d45ba8cd2f9 SOURCES/lsscsi-0.32.tgz diff --git a/SOURCES/lsscsi-0.32-fix-uninitialized-variable.patch b/SOURCES/lsscsi-0.32-fix-uninitialized-variable.patch deleted file mode 100644 index 68a295a..0000000 --- a/SOURCES/lsscsi-0.32-fix-uninitialized-variable.patch +++ /dev/null @@ -1,34 +0,0 @@ -From db8d419ba39e4547de602ef1ff58cd97d5e1102d Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek -Date: Wed, 11 Nov 2020 15:39:16 +0100 -Subject: [PATCH] fix uninitialized variable - -Error: UNINIT (CWE-457): [#def1] -lsscsi-032r164/src/lsscsi.c:3341: var_decl: Declaring variable "type" without initializer. -lsscsi-032r164/src/lsscsi.c:3586: uninit_use_in_call: Using uninitialized value "type" when calling "is_direct_access_dev". - 3584| my_strcopy(blkdir, buff, sizeof(blkdir)); - 3585| value[0] = 0; - 3586|-> if (! (is_direct_access_dev(type) && - 3587| block_scan(blkdir) && - 3588| if_directory_chdir(blkdir, ".") && ---- - src/lsscsi.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/lsscsi.c b/src/lsscsi.c -index 6544153..8a30299 100644 ---- a/src/lsscsi.c -+++ b/src/lsscsi.c -@@ -3338,7 +3338,8 @@ one_sdev_entry(const char * dir_name, const char * devname, - const struct lsscsi_opts * op) - { - bool get_wwn = false; -- int type, n, vlen; -+ int type = 0; -+ int n, vlen; - int devname_len = 13; - char buff[LMAX_DEVPATH]; - char extra[LMAX_DEVPATH]; --- -2.26.2 - diff --git a/SOURCES/lsscsi-0.33-wwn-trunc.patch b/SOURCES/lsscsi-0.33-wwn-trunc.patch deleted file mode 100644 index c8c05e9..0000000 --- a/SOURCES/lsscsi-0.33-wwn-trunc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c13c9d3a90aec4779a0cbe484913f24bce947ab1 Mon Sep 17 00:00:00 2001 -From: Wenchao Hao -Date: Tue, 8 Jun 2021 16:26:04 +0800 -Subject: [PATCH] Fix lsscsi wwn number output error - -The true wwn number is from the sixth byte of scsi-* - -Signed-off-by: Wenchao Hao ---- - src/lsscsi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lsscsi.c b/src/lsscsi.c -index 6f6953f..2be3ab9 100644 ---- a/src/lsscsi.c -+++ b/src/lsscsi.c -@@ -1515,7 +1515,7 @@ collect_disk_wwn_nodes(void) - - cur_ent = &cur_list->nodes[cur_list->count]; - my_strcopy(cur_ent->wwn, "0x", 3); -- my_strcopy(cur_ent->wwn + 2, dep->d_name + 5, -+ my_strcopy(cur_ent->wwn + 2, dep->d_name + 6, - sizeof(cur_ent->wwn) - 2); - my_strcopy(cur_ent->disk_bname, basename(symlink_path), - sizeof(cur_ent->disk_bname)); diff --git a/SPECS/lsscsi.spec b/lsscsi.spec similarity index 67% rename from SPECS/lsscsi.spec rename to lsscsi.spec index 88ad289..3088c06 100644 --- a/SPECS/lsscsi.spec +++ b/lsscsi.spec @@ -1,15 +1,13 @@ Summary: List SCSI devices (or hosts) and associated information Name: lsscsi Version: 0.32 -Release: 3%{?dist} -License: GPLv2+ -Group: Applications/System +Release: 12%{?dist} +License: GPL-2.0-or-later # official git repository: https://github.com/doug-gilbert/lsscsi Source0: http://sg.danny.cz/scsi/%{name}-%{version}.tgz URL: http://sg.danny.cz/scsi/lsscsi.html -Patch0: lsscsi-0.32-fix-uninitialized-variable.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1981038 -Patch1: lsscsi-0.33-wwn-trunc.patch +BuildRequires: gcc +BuildRequires: make %description Uses information provided by the sysfs pseudo file system in Linux kernel @@ -23,14 +21,15 @@ Author: %prep -%autosetup -p 1 -n %{name}-032r164 +%autosetup -p1 %build -%configure -make %{?_smp_mflags} +%configure --disable-nvme-supp +%make_build + %install -make DESTDIR=%{buildroot} install +%make_install %files @@ -40,20 +39,72 @@ make DESTDIR=%{buildroot} install %changelog -* Mon Aug 16 2021 Tomas Bzatek - 0.32-3 -- Fix WWN ID truncation (#1981038) +* Tue May 07 2024 Tomas Bzatek - 0.32-12 +- Disable NVMe support -* Wed Nov 11 2020 Tomas Bzatek - 0.32-2 -- Fix an unitialized variable (Covscan) +* Mon Feb 12 2024 Tomas Bzatek - 0.32-11 +- Use a SPDX license tag -* Tue Nov 10 2020 Tomas Bzatek - 0.32-1 -- Upgrade to 0.32 upstream snapshot (#1855766) -- Fix NVMe device parsing (#1687841, #1845977) -- Fix WWN string reporting (#1846559) -- Implement SCSI identifier sort priority (#1846566) +* Thu Jan 25 2024 Fedora Release Engineering - 0.32-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Fri Aug 10 2018 Gris Ge 0.30-1 -- Upgrade to 0.30 release. +* Sun Jan 21 2024 Fedora Release Engineering - 0.32-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 0.32-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 0.32-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.32-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.32-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.32-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 07 2021 Dan Horák - 0.32-3 +- update to 0.32 final + +* Tue Jan 26 2021 Fedora Release Engineering - 0.32-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Nov 12 2020 Tomas Bzatek - 0.32-1 +- Update to 0.32 upstream snapshot + +* Tue Jul 28 2020 Fedora Release Engineering - 0.31-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Tom Stellard - 0.31-2 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Fri Feb 21 2020 Dan Horák - 0.31-1 +- update to 0.31 (#1758436) + +* Wed Jan 29 2020 Fedora Release Engineering - 0.30-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0.30-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.30-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 24 2018 Dan Horák - 0.30-1 +- update to 0.30 + +* Fri Jul 13 2018 Fedora Release Engineering - 0.28-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Apr 16 2018 Dan Horák - 0.28-8 +- fix FTBFS + +* Thu Feb 08 2018 Fedora Release Engineering - 0.28-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild * Thu Aug 03 2017 Fedora Release Engineering - 0.28-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources new file mode 100644 index 0000000..054fed0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (lsscsi-0.32.tgz) = 96cb87be53eae9fa3a7defa0065f4dee8ccc23805a9ed1dc93d101c5e0610b78765b61449bf6ce58c13de8aae8400e4ac6a60ad64f840d092b9d7293106c5145