From 6cb887b7db374e797fc3195ed3d59e7d49205eaa Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 26 May 2022 11:16:42 -0400 Subject: [PATCH] Auto sync2gitlab import of lsscsi-0.32-3.el8.src.rpm --- .gitignore | 1 + EMPTY | 1 - lsscsi-0.32-fix-uninitialized-variable.patch | 34 ++++ lsscsi-0.33-wwn-trunc.patch | 25 +++ lsscsi.spec | 173 +++++++++++++++++++ sources | 1 + 6 files changed, 234 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 EMPTY create mode 100644 lsscsi-0.32-fix-uninitialized-variable.patch create mode 100644 lsscsi-0.33-wwn-trunc.patch create mode 100644 lsscsi.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..14b51f1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/lsscsi-0.32.tgz diff --git a/EMPTY b/EMPTY deleted file mode 100644 index 0519ecb..0000000 --- a/EMPTY +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lsscsi-0.32-fix-uninitialized-variable.patch b/lsscsi-0.32-fix-uninitialized-variable.patch new file mode 100644 index 0000000..68a295a --- /dev/null +++ b/lsscsi-0.32-fix-uninitialized-variable.patch @@ -0,0 +1,34 @@ +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/lsscsi-0.33-wwn-trunc.patch b/lsscsi-0.33-wwn-trunc.patch new file mode 100644 index 0000000..c8c05e9 --- /dev/null +++ b/lsscsi-0.33-wwn-trunc.patch @@ -0,0 +1,25 @@ +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/lsscsi.spec b/lsscsi.spec new file mode 100644 index 0000000..88ad289 --- /dev/null +++ b/lsscsi.spec @@ -0,0 +1,173 @@ +Summary: List SCSI devices (or hosts) and associated information +Name: lsscsi +Version: 0.32 +Release: 3%{?dist} +License: GPLv2+ +Group: Applications/System +# 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 + +%description +Uses information provided by the sysfs pseudo file system in Linux kernel +2.6 series to list SCSI devices or all SCSI hosts. Includes a "classic" +option to mimic the output of "cat /proc/scsi/scsi" that has been widely +used prior to the lk 2.6 series. + +Author: +-------- + Doug Gilbert + + +%prep +%autosetup -p 1 -n %{name}-032r164 + +%build +%configure +make %{?_smp_mflags} + +%install +make DESTDIR=%{buildroot} install + + +%files +%doc ChangeLog INSTALL README CREDITS AUTHORS COPYING +%{_bindir}/%{name} +%{_mandir}/man8/%{name}.8* + + +%changelog +* Mon Aug 16 2021 Tomas Bzatek - 0.32-3 +- Fix WWN ID truncation (#1981038) + +* Wed Nov 11 2020 Tomas Bzatek - 0.32-2 +- Fix an unitialized variable (Covscan) + +* 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) + +* Fri Aug 10 2018 Gris Ge 0.30-1 +- Upgrade to 0.30 release. + +* Thu Aug 03 2017 Fedora Release Engineering - 0.28-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.28-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0.28-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 0.28-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Dec 06 2014 Dan Horák - 0.28-1 +- update to 0.28 + +* Sun Aug 17 2014 Fedora Release Engineering - 0.27-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 0.27-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri May 17 2013 Dan Horák - 0.27-1 +- update to 0.27 + +* Thu Feb 14 2013 Fedora Release Engineering - 0.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 0.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Mar 28 2012 Dan Horák - 0.26-1 +- update to 0.26 + +* Fri Jan 13 2012 Fedora Release Engineering - 0.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jul 18 2011 Dan Horák - 0.25-1 +- update to 0.25 + +* Tue Feb 08 2011 Fedora Release Engineering - 0.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu May 6 2010 Dan Horák - 0.23-2 +- fix path separator for FC devices (#589327) +- fix for kernels with unified string representation of NULL (#589860) + +* Sun Dec 6 2009 Dan Horák - 0.23-1 +- update to 0.23 + +* Sat Jul 25 2009 Fedora Release Engineering - 0.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 2 2009 Dan Horák - 0.22-1 +- update to 0.22 + +* Tue Nov 4 2008 Dan Horák - 0.21-2 +- add disttag + +* Tue Nov 4 2008 Dan Horák - 0.21-1 +- update to 0.21 +- update urls + +* Thu May 22 2008 Tom "spot" Callaway - 0.17-6 +- fix license tag + +* Mon Feb 18 2008 Fedora Release Engineering - 0.17-5 +- Autorebuild for GCC 4.3 + +* Thu Oct 05 2006 Christian Iseli 0.17-4 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Tue Sep 19 2006 - Chip Coldwell 0.17-3 +- bump the EVR for FC6 rebuild +* Mon Jul 17 2006 - Chip Coldwell 0.17-2 +- modify spec file to meet Fedora Project packaging guidelines +* Mon Feb 06 2006 - Doug Gilbert 0.17-1 +- fix disappearance of block device names in lk 2.6.16-rc1 +* Fri Dec 30 2005 - Doug Gilbert 0.16-1 +- wlun naming, osst and changer devices +* Tue Jul 19 2005 - Doug Gilbert 0.15-1 +- does not use libsysfs, add filter argument, /dev scanning +* Fri Aug 20 2004 - Doug Gilbert 0.13-1 +- add 'timeout' +* Sun May 9 2004 - Doug Gilbert 0.12-1 +- rework for lk 2.6.6, device state, host name, '-d' for major+minor +* Fri Jan 09 2004 - Doug Gilbert 0.11-1 +- rework for lk 2.6.1 +* Tue May 06 2003 - Doug Gilbert 0.10-1 +- adjust HBA listing for lk > 2.5.69 +* Fri Apr 04 2003 - Doug Gilbert 0.09-1 +- fix up sorting, GPL + copyright notice +* Sun Mar 2 2003 - Doug Gilbert 0.08-1 +- start to add host listing support (lk >= 2.5.63) +* Fri Feb 14 2003 - Doug Gilbert 0.07-1 +- queue_depth name change in sysfs (lk 2.5.60) +* Mon Jan 20 2003 - Doug Gilbert 0.06-1 +- osst device file names fix +* Sat Jan 18 2003 - Doug Gilbert 0.05-1 +- output st and osst device file names (rather than "-") +* Thu Jan 14 2003 - Doug Gilbert 0.04-1 +- fix multiple listings of st devices (needed for lk 2.5.57) +* Thu Jan 09 2003 - Doug Gilbert 0.03-1 +- add --generic option (list sg devices), scsi_level output +* Wed Dec 18 2002 - Doug Gilbert 0.02-1 +- add more options including classic mode +* Fri Dec 13 2002 - Doug Gilbert 0.01-1 +- original diff --git a/sources b/sources new file mode 100644 index 0000000..4a057e5 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (lsscsi-0.32.tgz) = 8755e6bbdb8daaf6ab28a62c8b3a10e1f57b70590a0da03e9a8bc96954b17606444e7f5577af2b176aa06d89244d9a5dd3f91251694676ba1dac1543b3788fb9