diff --git a/.gitignore b/.gitignore index dc68ff9..f9a512a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mstflint-4.3.0-1.49.g9b9af70.tar.gz +SOURCES/mstflint-4.6.0.tar.gz diff --git a/.mstflint.metadata b/.mstflint.metadata index 99a009c..5653efa 100644 --- a/.mstflint.metadata +++ b/.mstflint.metadata @@ -1 +1 @@ -855bec1f6d33277857bf2c19eccdc20cbc8e08db SOURCES/mstflint-4.3.0-1.49.g9b9af70.tar.gz +41c794f397f031be0f000b0422cd45d3fd44e374 SOURCES/mstflint-4.6.0.tar.gz diff --git a/SOURCES/0001-Extend-buffer-for-a-few-arrays.patch b/SOURCES/0001-Extend-buffer-for-a-few-arrays.patch new file mode 100644 index 0000000..ffac349 --- /dev/null +++ b/SOURCES/0001-Extend-buffer-for-a-few-arrays.patch @@ -0,0 +1,47 @@ +From b947fc631d499fa6e041b6c460320bcd253f4671 Mon Sep 17 00:00:00 2001 +From: Honggang Li +Date: Wed, 22 Feb 2017 01:42:25 -0500 +Subject: [PATCH] Extend buffer for a few arrays + +Signed-off-by: Honggang Li +--- + mtcr_ul/mtcr_ul_com.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/mtcr_ul/mtcr_ul_com.c b/mtcr_ul/mtcr_ul_com.c +index 50a663f..1335b43 100644 +--- a/mtcr_ul/mtcr_ul_com.c ++++ b/mtcr_ul/mtcr_ul_com.c +@@ -1353,7 +1353,7 @@ int mdevices_v_ul(char *buf, int len, int mask, int verbosity) + } + + char inbuf[64]; +- char fname[64]; ++ char fname[300]; + + d = opendir("/sys/bus/pci/devices"); + if (d == NULL) { +@@ -1369,7 +1369,7 @@ int mdevices_v_ul(char *buf, int len, int mask, int verbosity) + continue; + } else if (sz > 4 && strcmp(dir->d_name + sz - 4, "00.0") && !verbosity) { + // Skip virtual functions +- char physfn[64]; ++ char physfn[300]; + DIR* physfndir; + sprintf(physfn, "/sys/bus/pci/devices/%s/physfn", dir->d_name); + if ((physfndir = opendir(physfn)) != NULL) { +@@ -1993,9 +1993,9 @@ int mclose_ul(mfile *mf) + return 0; + } + +-#define IBDR_MAX_NAME_SIZE 128 ++#define IBDR_MAX_NAME_SIZE 300 + #define BDF_NAME_SIZE 12 +-#define DEV_DIR_MAX_SIZE 128 ++#define DEV_DIR_MAX_SIZE 300 + static + int get_inband_dev_from_pci(char* inband_dev, char* pci_dev) + { +-- +2.7.4 + diff --git a/SOURCES/fix-issues-reported-by-lexgrog.patch b/SOURCES/fix-issues-reported-by-lexgrog.patch new file mode 100644 index 0000000..6a34df0 --- /dev/null +++ b/SOURCES/fix-issues-reported-by-lexgrog.patch @@ -0,0 +1,84 @@ +diff --git a/man/mstconfig.1 b/man/mstconfig.1 +index d172e66..5318716 100644 +--- a/man/mstconfig.1 ++++ b/man/mstconfig.1 +@@ -1,6 +1,6 @@ + .TH MSTCONFIG "1" "4.6.0" "10 January 2017" "" + .SH NAME +-mstconfig ++mstconfig \- Sets or queries non-volatile configurable options for Mellanox HCAs + .IP + .SH SYNOPSIS: + .IP +diff --git a/man/mstmcra.1 b/man/mstmcra.1 +index 935f39e..a7be945 100644 +--- a/man/mstmcra.1 ++++ b/man/mstmcra.1 +@@ -1,6 +1,6 @@ + .TH MSTMCRA "1" "4.6.0" "" + .SH NAME +-mstmcra ++mstmcra \- Mellanox Configuration Registers Access tool + .IP + .SH SYNOPSIS: + .IP +diff --git a/man/mstmread.1 b/man/mstmread.1 +index d47feb2..985a159 100644 +--- a/man/mstmread.1 ++++ b/man/mstmread.1 +@@ -1,6 +1,6 @@ + .TH MSTMREAD "1" "4.6.0" "" + .SH NAME +-mstmread ++mstmread \- Mellanox Read Configuration Register Tool + .IP + .SH SYNOPSIS: + .IP +diff --git a/man/mstmtserver.1 b/man/mstmtserver.1 +index 22ba224..1762241 100644 +--- a/man/mstmtserver.1 ++++ b/man/mstmtserver.1 +@@ -1,6 +1,6 @@ + .TH MSTMTSERVER "1" "4.6.0" "" + .SH NAME +-mstmtserver ++mstmtserver \- Mellanox Software tools (mst) server (remote mtcr calls) + .IP + .SH SYNOPSIS: + .IP +diff --git a/man/mstmwrite.1 b/man/mstmwrite.1 +index b3cc05a..b8dcbe9 100644 +--- a/man/mstmwrite.1 ++++ b/man/mstmwrite.1 +@@ -1,6 +1,6 @@ + .TH MSTMWRITE "1" "4.6.0" "" "" + .SH NAME +-mstmwrite ++mstmwrite \- Mellanox Write Configuration Register Tool + .IP + .SH SYNOPSIS: + .IP +diff --git a/man/mstregdump.1 b/man/mstregdump.1 +index 77a6e3c..f7db942 100644 +--- a/man/mstregdump.1 ++++ b/man/mstregdump.1 +@@ -1,6 +1,6 @@ + .TH MSTREGDUMP "1" "4.6.0" "" "" + .SH NAME +-mstregdump ++mstregdump \- Dumps Mellanox device internal configuration data + .IP + .SH SYNOPSIS: + .IP +diff --git a/man/mstvpd.1 b/man/mstvpd.1 +index 85ca8f4..9fb02e2 100644 +--- a/man/mstvpd.1 ++++ b/man/mstvpd.1 +@@ -1,6 +1,6 @@ + .TH MSTVPD "1" "4.6.0" "" "" + .SH NAME +-mstvpd ++mstvpd \- Mellanox VPD read tool + .IP + .SH SYNOPSIS: + .IP diff --git a/SPECS/mstflint.spec b/SPECS/mstflint.spec index 3955974..919f247 100644 --- a/SPECS/mstflint.spec +++ b/SPECS/mstflint.spec @@ -1,11 +1,13 @@ Name: mstflint Summary: Mellanox firmware burning tool -Version: 4.3.0 -Release: 1.49.g9b9af70.1%{?dist} +Version: 4.6.0 +Release: 2%{?dist} License: GPLv2+ or BSD Group: Applications/System -Source: https://www.openfabrics.org/downloads/%{name}/%{name}-%{version}-1.49.g9b9af70.tar.gz -Url: http://www.openfabrics.org +Source: https://github.com/Mellanox/%{name}/releases/download/v%{version}-1/%{name}-%{version}.tar.gz +Patch1: 0001-Extend-buffer-for-a-few-arrays.patch +Patch2: fix-issues-reported-by-lexgrog.patch +Url: https://github.com/Mellanox/mstflint BuildRequires: libstdc++-devel, zlib-devel, libibmad-devel Obsoletes: openib-mstflint <= 1.4 openib-tvflash <= 0.9.2 tvflash <= 0.9.0 ExcludeArch: s390 s390x @@ -16,6 +18,8 @@ It also provides access to the relevant source code. %prep %setup -q +%patch1 -p1 +%patch2 -p1 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';' find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';' @@ -29,14 +33,25 @@ export CXXFLAGS="$RPM_OPT_FLAGS -std=gnu++98 -Wno-c++11-compat" make DESTDIR=%{buildroot} install # Remove the devel files that we don't ship rm -fr %{buildroot}%{_includedir} -rm -fr %{buildroot}%{_datadir} -rm -fr %{buildroot}%{_libdir}/*.a +rm -fr %{buildroot}%{_libdir} %files %doc README %_bindir/* +%{_datadir}/mstflint +%{_mandir}/man1/* + %changelog +* Tue Mar 7 2017 Honggang Li - 4.6.0-2 +- Fix manpage issues reported by lexgrog. +- Resolves: bz948474 + +* Mon Feb 27 2017 Honggang Li - 4.6.0-1 +- Rebase to latest upstream from github. +- Add man pages. +- Resolves: bz948474, bz1416697 + * Wed Apr 20 2016 Honggang Li - 4.3.0-1.49.g9b9af70.1 - Rebase to latest upstream version 4.3.0-1.49.g9b9af70. - Spec file cleanup.