Rebase mstflint to latest upstream release v4.14.0-3

Signed-off-by: Honggang Li <honli@redhat.com>

.gitignore

@@ -31,3 +31,4 @@ noarch/
 /mstflint-4.13.3-1.tar.gz
 /mstflint-4.13.3-2.tar.gz
 /mstflint-4.14.0-1.tar.gz
+/mstflint-4.14.0-3.tar.gz

0001-Fix-a-format-security-compilation-defect.patch

@@ -1,45 +0,0 @@
-From 28dfbf252a31b4e8c1d0f5e038f6889b7eadfc16 Mon Sep 17 00:00:00 2001
-From: Honggang Li <honli@redhat.com>
-Date: Wed, 1 Apr 2020 10:52:12 +0800
-Subject: [PATCH] Fix a format security compilation defect
-
-subcommands.cpp:1852:42: error: format not a string literal and no format arguments [-Werror=format-security]
-1852 | false, "N/A").c_str());
-
-Signed-off-by: Honggang Li <honli@redhat.com>
----
- flint/subcommands.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
-index 7230f9a59f94..0f6440be7b28 100755
---- a/flint/subcommands.cpp
-+++ b/flint/subcommands.cpp
-@@ -1847,7 +1847,7 @@ bool BurnSubCommand::checkFwVersion(bool CreateFromImgInfo, u_int16_t fw_ver0, u
-     char curr_ver[124], new_ver[124];
-     printf("\n");
-     printf("    Current FW version on flash:  ");
--    snprintf(curr_ver, 124,
-+    snprintf(curr_ver, 124, "%s",
-             current.get_fw_version(VERSION_FORMAT(_devInfo.fw_info.fw_ver[1]),
-                     false, "N/A").c_str());
- 
-@@ -1856,13 +1856,13 @@ bool BurnSubCommand::checkFwVersion(bool CreateFromImgInfo, u_int16_t fw_ver0, u
- 
-     printf("    New FW version:               ");
-     if (CreateFromImgInfo) {
--        snprintf(new_ver, 124,
-+        snprintf(new_ver, 124, "%s",
-                 new_version.get_fw_version(
-                         VERSION_FORMAT(_imgInfo.fw_info.fw_ver[1]), false,
-                         "N/A").c_str());
-     }
-     else {
--        snprintf(new_ver, 124,
-+        snprintf(new_ver, 124, "%s",
-                 new_version.get_fw_version(VERSION_FORMAT(fw_ver1), false,
-                         "N/A").c_str());
-     }
--- 
-2.25.1
-

mstflint.spec

@@ -3,14 +3,13 @@
 Name:		mstflint
 Summary:	Mellanox firmware burning tool
 Version:	4.14.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+ or BSD
 Group:		Applications/System
-Source: 	https://github.com/Mellanox/mstflint/releases/download/v4.14.0-1/mstflint-4.14.0-1.tar.gz
+Source: 	https://github.com/Mellanox/mstflint/releases/download/v4.14.0-3/mstflint-4.14.0-3.tar.gz
 Patch3: 	extend-buffer.patch
 Patch4: 	add-default-link-flags-for-shared-libraries.patch
 Patch6: 	replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch
-Patch7: 	0001-Fix-a-format-security-compilation-defect.patch
 Url:		https://github.com/Mellanox/mstflint
 BuildRequires:	libstdc++-devel, zlib-devel, libibmad-devel, gcc-c++, gcc
 BuildRequires:  libcurl-devel, boost-devel, libxml2-devel, openssl-devel
@@ -26,11 +25,10 @@ This package contains firmware update tool, vpd dump and register dump tools
 for network adapters based on Mellanox Technologies chips.
 
 %prep
-%setup -q
+%setup -q -n mstflint-4.14.0-3
 %patch3 -p1
 %patch4 -p1
 %patch6 -p1
-%patch7 -p1
 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';'
 find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
 
@@ -58,6 +56,9 @@ find %{buildroot} -type f -name '*.a' -delete
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jun 22 2020 Honggang Li <honli@redhat.com> - 4.14.0-3
+- Rebase mstflint to latest upstream release v4.14.0-3
+
 * Sat May 30 2020 Jonathan Wakely <jwakely@redhat.com> - 4.14.0-2
 - Rebuilt for Boost 1.73
 

sources

@@ -1 +1 @@
-SHA512 (mstflint-4.14.0-1.tar.gz) = 965b25141d1b960bb575fc9fb089e912b0408af72919d23f295c6a8e8650c95c9459cb496171dca7f818252a180bd85bee8ed0f876159279013828478a0c2101
+SHA512 (mstflint-4.14.0-3.tar.gz) = 12506e4ed8d546212c55fb49a5b594637fc3b68f3ed18fc6c14636dd0312e056c4738c58d113553637e8afa8693872f49ec6a7df9440763e073f5182918d5e3c