.gitignore

@@ -1 +1 @@
-SOURCES/mstflint-4.25.0-1.tar.gz
+SOURCES/mstflint-4.11.0-2.tar.gz

.mstflint.metadata

@@ -0,0 +1 @@
+f5aa2812b7c57810779938cbf69bf87e967f782c SOURCES/mstflint-4.11.0-2.tar.gz

SOURCES/0001-Fix-shebang-for-python-scripts.patch

@@ -0,0 +1,119 @@
+From f355d4902890e5b4db15b87903a299697764bc8a Mon Sep 17 00:00:00 2001
+From: Honggang Li <honli@redhat.com>
+Date: Fri, 8 Feb 2019 21:26:39 -0500
+Subject: [PATCH] Fix shebang for python scripts
+
+rhel-8 does not support python2. User '#!/usr/bin/python3' for all
+python scripts which with a shebang.
+
+The substitution was done with following bash script.
+
+====
+
+pys=$(find . -type f -name '*.py')
+
+for f in $pys; do
+	sed -ne '1p' $f | grep -q -E '^#!/usr/bin'
+	if [ $? -eq 0 ]; then
+		echo $f
+		sed -e '/^#!\/usr\/bin/d' -i $f
+		sed -e '1 i\#!/usr/bin/python3' -i $f
+	fi
+done
+===
+
+Signed-off-by: Honggang Li <honli@redhat.com>
+---
+ mtcr_py/test.py                                         | 2 +-
+ small_utils/mlxfwresetlib/mcra.py                       | 2 +-
+ small_utils/mlxfwresetlib/mlnx_peripheral_components.py | 2 +-
+ small_utils/mlxfwresetlib/mlxfwreset_mlnxdriver.py      | 2 +-
+ small_utils/mlxfwresetlib/mlxfwreset_status_checker.py  | 2 +-
+ small_utils/mlxfwresetlib/mlxfwreset_utils.py           | 2 +-
+ small_utils/mlxfwresetlib/pci_device.py                 | 2 +-
+ small_utils/mstfwreset.py                               | 2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/mtcr_py/test.py b/mtcr_py/test.py
+index 74c5d28..1e44232 100755
+--- a/mtcr_py/test.py
++++ b/mtcr_py/test.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ # Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved.
+ #
+ # This software is available to you under a choice of one of two
+diff --git a/small_utils/mlxfwresetlib/mcra.py b/small_utils/mlxfwresetlib/mcra.py
+index 2144d43..bc44356 100644
+--- a/small_utils/mlxfwresetlib/mcra.py
++++ b/small_utils/mlxfwresetlib/mcra.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ # Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved.
+ #
+diff --git a/small_utils/mlxfwresetlib/mlnx_peripheral_components.py b/small_utils/mlxfwresetlib/mlnx_peripheral_components.py
+index 0ddf8d9..469e24b 100644
+--- a/small_utils/mlxfwresetlib/mlnx_peripheral_components.py
++++ b/small_utils/mlxfwresetlib/mlnx_peripheral_components.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ # Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved.
+ #
+diff --git a/small_utils/mlxfwresetlib/mlxfwreset_mlnxdriver.py b/small_utils/mlxfwresetlib/mlxfwreset_mlnxdriver.py
+index 4971b00..1f34925 100755
+--- a/small_utils/mlxfwresetlib/mlxfwreset_mlnxdriver.py
++++ b/small_utils/mlxfwresetlib/mlxfwreset_mlnxdriver.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ # Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved.
+ #
+diff --git a/small_utils/mlxfwresetlib/mlxfwreset_status_checker.py b/small_utils/mlxfwresetlib/mlxfwreset_status_checker.py
+index 1d614ac..153c87b 100755
+--- a/small_utils/mlxfwresetlib/mlxfwreset_status_checker.py
++++ b/small_utils/mlxfwresetlib/mlxfwreset_status_checker.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ # Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved.
+ #
+diff --git a/small_utils/mlxfwresetlib/mlxfwreset_utils.py b/small_utils/mlxfwresetlib/mlxfwreset_utils.py
+index 9b07328..2c64044 100755
+--- a/small_utils/mlxfwresetlib/mlxfwreset_utils.py
++++ b/small_utils/mlxfwresetlib/mlxfwreset_utils.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ # Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved.
+ #
+diff --git a/small_utils/mlxfwresetlib/pci_device.py b/small_utils/mlxfwresetlib/pci_device.py
+index 69a65ed..04a6c9a 100644
+--- a/small_utils/mlxfwresetlib/pci_device.py
++++ b/small_utils/mlxfwresetlib/pci_device.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ # Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved.
+ #
+diff --git a/small_utils/mstfwreset.py b/small_utils/mstfwreset.py
+index 6d45200..f764de3 100755
+--- a/small_utils/mstfwreset.py
++++ b/small_utils/mstfwreset.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ # Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved.
+ #
+-- 
+2.20.1
+

SOURCES/0001-mstflint-crash-when-compiled-with-CXXFLAGS-Wp-D_GLIB.patch

@@ -0,0 +1,26 @@
+From cef28b2989c4df76869ca0d71322c099134774ab Mon Sep 17 00:00:00 2001
+From: root <root@apps-62.mtl.labs.mlnx>
+Date: Sun, 10 Feb 2019 14:25:44 +0200
+Subject: [PATCH] mstflint crash when compiled with
+ 'CXXFLAGS='-Wp,-D_GLIBCXX_ASSERTIONS''
+
+---
+ mlxfwops/lib/fs3_ops.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mlxfwops/lib/fs3_ops.cpp b/mlxfwops/lib/fs3_ops.cpp
+index bfe8adb..55f2b71 100644
+--- a/mlxfwops/lib/fs3_ops.cpp
++++ b/mlxfwops/lib/fs3_ops.cpp
+@@ -525,7 +525,7 @@ bool Fs3Operations::VerifyTOC(u_int32_t dtoc_addr, bool &bad_signature, VerifyCa
+                     }
+                     // Only when we have full verify or the info of this section should be collected for query
+                     std::vector<u_int8_t> buffv(entry_size_in_bytes);
+-                    u_int8_t *buff = (u_int8_t *)(&(buffv[0]));
++                    u_int8_t *buff = (u_int8_t *)(buffv.size() ? (&(buffv[0])) : NULL);
+                     if (show_itoc) {
+                         cibfw_itoc_entry_dump(&toc_entry, stdout);
+                         if (!DumpFs3CRCCheck(toc_entry.type, phys_addr, entry_size_in_bytes, 0, 0, true, verifyCallBackFunc)) {
+-- 
+2.20.1
+

SOURCES/add-default-link-flags-for-shared-libraries.patch

@@ -1,21 +1,8 @@
-From 0bf822388a194c01c82beb6b6529b49255a4bd39 Mon Sep 17 00:00:00 2001
-From: Kamal Heib <kheib@redhat.com>
-Date: Tue, 17 Oct 2023 14:19:52 -0400
-Subject: [PATCH] Add default link flags for shared libraries
-
-Signed-off-by: Kamal Heib <kheib@redhat.com>
----
- cmdif/Makefile.am      | 2 +-
- dev_mgt/Makefile.am    | 2 +-
- mtcr_py/Makefile.am    | 2 +-
- reg_access/Makefile.am | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
 diff --git a/cmdif/Makefile.am b/cmdif/Makefile.am
-index b6c43d59c8b5..0e03839459f2 100644
+index d4f89a2..46604f5 100644
 --- a/cmdif/Makefile.am
 +++ b/cmdif/Makefile.am
-@@ -51,7 +51,7 @@ libcmdif_a_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common.h
+@@ -46,7 +46,7 @@ libcmdif_a_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common.h
  cmdif_pylibdir = $(libdir)/mstflint/python_tools/
  cmdif_pylib_DATA = ${CCMDIF_SO} cmdif.py
  ${CCMDIF_SO}: libcmdif.a
@@ -25,7 +12,7 @@ index b6c43d59c8b5..0e03839459f2 100644
  
  CLEANFILES = ${CCMDIF_SO}
 diff --git a/dev_mgt/Makefile.am b/dev_mgt/Makefile.am
-index 2283c2d1c763..ab8910dfc435 100644
+index 907e5ce..a7e2249 100644
 --- a/dev_mgt/Makefile.am
 +++ b/dev_mgt/Makefile.am
 @@ -50,7 +50,7 @@ dev_mgt_pylib_DATA = c_dev_mgt.so dev_mgt.py
@@ -38,31 +25,28 @@ index 2283c2d1c763..ab8910dfc435 100644
  	-L$(USER_DIR)/tools_layouts -ltools_layouts \
  	-L$(USER_DIR)/${MTCR_CONF_DIR} -lmtcr_ul
 diff --git a/mtcr_py/Makefile.am b/mtcr_py/Makefile.am
-index 934b8030a229..c8af0c2d5dac 100644
+index 5f5677d..566a870 100644
 --- a/mtcr_py/Makefile.am
 +++ b/mtcr_py/Makefile.am
-@@ -40,7 +40,7 @@ MTCR_DIR = $(USER_DIR)/${MTCR_CONF_DIR}
+@@ -39,7 +39,7 @@ MTCR_DIR = $(USER_DIR)/${MTCR_CONF_DIR}
  mtcr_pylib_DATA = cmtcr.so mtcr.py
  dist_mtcr_pylib_DATA = mtcr.py
  cmtcr.so:
--	$(CC) -g -Wall -pthread -shared ${CFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so $(MFT_CORE_LIB_LINK)
+-	$(CC) -g -Wall -pthread -shared ${CFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so
-+	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so $(MFT_CORE_LIB_LINK)
++	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so
  
  CLEANFILES = cmtcr.so
  
 diff --git a/reg_access/Makefile.am b/reg_access/Makefile.am
-index c33bac653620..a231a6cd57e1 100644
+index 353fe02..7d70fd8 100644
 --- a/reg_access/Makefile.am
 +++ b/reg_access/Makefile.am
-@@ -56,7 +56,7 @@ reg_access_pylib_DATA = ${RREG_ACCESS_SO} regaccess.py regaccess_structs.py
+@@ -53,7 +53,7 @@ reg_access_pylib_DATA = ${RREG_ACCESS_SO} regaccess.py
- dist_reg_access_pylib_DATA = regaccess.py regaccess_structs.py
+ dist_reg_access_pylib_DATA = regaccess.py
  
  ${RREG_ACCESS_SO}: libreg_access.a
 -	$(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${RREG_ACCESS_SO} \
 +	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} *.o -o ${RREG_ACCESS_SO} \
- 	-L$(USER_DIR)/tools_layouts -ltools_layouts -lmlxconfig_4th_gen_layouts -L$(MTCR_DIR) -lmtcr_ul
+ 	-L$(USER_DIR)/tools_layouts -ltools_layouts -L$(MTCR_DIR) -lmtcr_ul
  
  CLEANFILES = ${RREG_ACCESS_SO}
--- 
-2.41.0
-

SOURCES/convert-format-for-mlxfwreset_status_checker.patch

@@ -0,0 +1,180 @@
+diff --git a/small_utils/mlxfwresetlib/mlxfwreset_status_checker.py b/small_utils/mlxfwresetlib/mlxfwreset_status_checker.py
+index 36b82ff..1d614ac 100755
+--- a/small_utils/mlxfwresetlib/mlxfwreset_status_checker.py
++++ b/small_utils/mlxfwresetlib/mlxfwreset_status_checker.py
+@@ -1,87 +1,87 @@
+-#!/usr/bin/python
+-
+-# Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved.
+-#
+-# This software is available to you under a choice of one of two
+-# licenses.  You may choose to be licensed under the terms of the GNU
+-# General Public License (GPL) Version 2, available from the file
+-# COPYING in the main directory of this source tree, or the
+-# OpenIB.org BSD license below:
+-#
+-#     Redistribution and use in source and binary forms, with or
+-#     without modification, are permitted provided that the following
+-#     conditions are met:
+-#
+-#      - Redistributions of source code must retain the above
+-#        copyright notice, this list of conditions and the following
+-#        disclaimer.
+-#
+-#      - Redistributions in binary form must reproduce the above
+-#        copyright notice, this list of conditions and the following
+-#        disclaimer in the documentation and/or other materials
+-#        provided with the distribution.
+-#
+-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+-# SOFTWARE.
+-#--
+-
+-"""
+-* $Id           : fwreset_status_checker.py 2017-11-28
+-* $Authors      : Ahmad Soboh (ahmads@mellanox.com)
+-"""
+-
+-######################################################################
+-# Description:  FirmwareResetStatusChecker
+-# OS Support :  Linux/Windows.
+-######################################################################
+-
+-
+-class FirmwareResetStatusChecker(object):
+-
+-    FirmwareUptimeStatusInit = 0x0
+-    FirmwareUptimeStatusBeforeDone = 0x1
+-    FirmwareUptimeStatusAfterDone = 0x2
+-    FirmwareUptimeStatusError = 0x3
+-
+-    FirmwareResetStatusDone = 0x0
+-    FirmwareResetStatusFailed = 0x1
+-    FirmwareResetStatusUnknown = 0x2
+-
+-    def __init__(self, regAccessObj):
+-        self._RegAccessObj = regAccessObj
+-        self._UptimeBeforeReset = 0x0
+-        self._UptimeBeforeStatus = FirmwareResetStatusChecker.FirmwareUptimeStatusInit
+-        self._UptimeAfterReset = 0x0
+-        self._UptimeAfterStatus = FirmwareResetStatusChecker.FirmwareUptimeStatusInit
+-
+-    def UpdateUptimeBeforeReset(self):
+-        try:
+-            self._UptimeBeforeReset = self._RegAccessObj.getFWUptime()
+-            self._UptimeBeforeStatus = FirmwareResetStatusChecker.FirmwareUptimeStatusBeforeDone
+-        except Exception as e:
+-            self._UptimeBeforeStatus = FirmwareResetStatusChecker.FirmwareUptimeStatusError
+-
+-    def UpdateUptimeAfterReset(self):
+-        try:
+-            self._UptimeAfterReset = self._RegAccessObj.getFWUptime()
+-            self._UptimeAfterStatus = FirmwareResetStatusChecker.FirmwareUptimeStatusAfterDone
+-        except Exception as e:
+-            self._UptimeAfterStatus = FirmwareResetStatusChecker.FirmwareUptimeStatusError
+-
+-    def GetStatus(self):
+-        if self._UptimeBeforeStatus == FirmwareResetStatusChecker.FirmwareUptimeStatusBeforeDone and\
+-                        self._UptimeAfterStatus == FirmwareResetStatusChecker.FirmwareUptimeStatusAfterDone:
+-            if self._UptimeAfterReset < self._UptimeBeforeReset:
+-                return FirmwareResetStatusChecker.FirmwareResetStatusDone
+-            else:
+-                if self._UptimeBeforeReset > 5: #5 seconds
+-                    return FirmwareResetStatusChecker.FirmwareResetStatusFailed
+-                else:
+-                    return FirmwareResetStatusChecker.FirmwareResetStatusUnknown
+-        return FirmwareResetStatusChecker.FirmwareResetStatusUnknown
+\ No newline at end of file
++#!/usr/bin/python
++
++# Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved.
++#
++# This software is available to you under a choice of one of two
++# licenses.  You may choose to be licensed under the terms of the GNU
++# General Public License (GPL) Version 2, available from the file
++# COPYING in the main directory of this source tree, or the
++# OpenIB.org BSD license below:
++#
++#     Redistribution and use in source and binary forms, with or
++#     without modification, are permitted provided that the following
++#     conditions are met:
++#
++#      - Redistributions of source code must retain the above
++#        copyright notice, this list of conditions and the following
++#        disclaimer.
++#
++#      - Redistributions in binary form must reproduce the above
++#        copyright notice, this list of conditions and the following
++#        disclaimer in the documentation and/or other materials
++#        provided with the distribution.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
++# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
++# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++# SOFTWARE.
++#--
++
++"""
++* $Id           : fwreset_status_checker.py 2017-11-28
++* $Authors      : Ahmad Soboh (ahmads@mellanox.com)
++"""
++
++######################################################################
++# Description:  FirmwareResetStatusChecker
++# OS Support :  Linux/Windows.
++######################################################################
++
++
++class FirmwareResetStatusChecker(object):
++
++    FirmwareUptimeStatusInit = 0x0
++    FirmwareUptimeStatusBeforeDone = 0x1
++    FirmwareUptimeStatusAfterDone = 0x2
++    FirmwareUptimeStatusError = 0x3
++
++    FirmwareResetStatusDone = 0x0
++    FirmwareResetStatusFailed = 0x1
++    FirmwareResetStatusUnknown = 0x2
++
++    def __init__(self, regAccessObj):
++        self._RegAccessObj = regAccessObj
++        self._UptimeBeforeReset = 0x0
++        self._UptimeBeforeStatus = FirmwareResetStatusChecker.FirmwareUptimeStatusInit
++        self._UptimeAfterReset = 0x0
++        self._UptimeAfterStatus = FirmwareResetStatusChecker.FirmwareUptimeStatusInit
++
++    def UpdateUptimeBeforeReset(self):
++        try:
++            self._UptimeBeforeReset = self._RegAccessObj.getFWUptime()
++            self._UptimeBeforeStatus = FirmwareResetStatusChecker.FirmwareUptimeStatusBeforeDone
++        except Exception as e:
++            self._UptimeBeforeStatus = FirmwareResetStatusChecker.FirmwareUptimeStatusError
++
++    def UpdateUptimeAfterReset(self):
++        try:
++            self._UptimeAfterReset = self._RegAccessObj.getFWUptime()
++            self._UptimeAfterStatus = FirmwareResetStatusChecker.FirmwareUptimeStatusAfterDone
++        except Exception as e:
++            self._UptimeAfterStatus = FirmwareResetStatusChecker.FirmwareUptimeStatusError
++
++    def GetStatus(self):
++        if self._UptimeBeforeStatus == FirmwareResetStatusChecker.FirmwareUptimeStatusBeforeDone and\
++                        self._UptimeAfterStatus == FirmwareResetStatusChecker.FirmwareUptimeStatusAfterDone:
++            if self._UptimeAfterReset < self._UptimeBeforeReset:
++                return FirmwareResetStatusChecker.FirmwareResetStatusDone
++            else:
++                if self._UptimeBeforeReset > 5: #5 seconds
++                    return FirmwareResetStatusChecker.FirmwareResetStatusFailed
++                else:
++                    return FirmwareResetStatusChecker.FirmwareResetStatusUnknown
++        return FirmwareResetStatusChecker.FirmwareResetStatusUnknown

SOURCES/extend-buffer.patch

@@ -0,0 +1,13 @@
+diff --git a/ext_libs/iniParser/iniparser.c b/ext_libs/iniParser/iniparser.c
+index 8bc0a18..f981775 100644
+--- a/ext_libs/iniParser/iniparser.c
++++ b/ext_libs/iniParser/iniparser.c
+@@ -572,7 +572,7 @@ dictionary * iniparser_load(const char * ininame)
+     char line    [ASCIILINESZ+1] ;
+     char section [ASCIILINESZ+1] ;
+     char key     [ASCIILINESZ+1] ;
+-    char tmp     [ASCIILINESZ+1] ;
++    char tmp     [(ASCIILINESZ+1)*2] ;
+     char val     [ASCIILINESZ+1] ;
+ 
+     int  last=0 ;

SOURCES/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch

@@ -1,8 +1,8 @@
 diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
-index 420b82f..0a20bcd 100644
+index 8c85e55..0822e8b 100644
 --- a/flint/subcommands.cpp
 +++ b/flint/subcommands.cpp
-@@ -4484,7 +4484,7 @@ FlintStatus SgSubCommand::sgFs2()
+@@ -2997,7 +2997,7 @@ FlintStatus SgSubCommand::sgFs2()
      return FLINT_SUCCESS;
  }
  
@@ -12,15 +12,15 @@ index 420b82f..0a20bcd 100644
  FlintStatus SgSubCommand::sgFs3()
  {
 diff --git a/mlxfwops/lib/flint_base.h b/mlxfwops/lib/flint_base.h
-index f3edc43..a85e43d 100644
+index eb434dc..e851085 100644
 --- a/mlxfwops/lib/flint_base.h
 +++ b/mlxfwops/lib/flint_base.h
-@@ -364,7 +364,7 @@ struct GPH {
+@@ -394,7 +394,7 @@ struct BOARD_ID {
- 
+ #define TLV_FORMAT_SECT    "TLVs format section"
+ #define TRACER_HASH_SECT   "Tracer Hash section"
  #define REBOOT_REQUIRED_STR "To load new FW run reboot machine."
- #ifndef MST_UL
 -#define REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mlxfwreset or reboot machine."
 +#define REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mstfwreset or reboot machine."
- #else
+ #define numbel(x) (sizeof(x) / sizeof((x)[0]))
- #define REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mstfwreset or reboot machine."
+ 
- #endif
+ void report(const char *format, ...);

SPECS/mstflint.spec

@@ -2,17 +2,18 @@
 
 Name:		mstflint
 Summary:	Mellanox firmware burning tool
-Version:	4.25.0
+Version:	4.11.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+ or BSD
-Url:		https://github.com/Mellanox/%{name}
-Source0: 	https://github.com/Mellanox/%{name}/releases/download/v%{version}-1/%{name}-%{version}-1.tar.gz
 Group:		Applications/System
-
+Source: 	https://github.com/Mellanox/mstflint/releases/download/v4.11.0-2/mstflint-4.11.0-2.tar.gz
-Patch4:	add-default-link-flags-for-shared-libraries.patch
+Patch1: 	convert-format-for-mlxfwreset_status_checker.patch
+Patch2: 	0001-Fix-shebang-for-python-scripts.patch
+Patch3: 	extend-buffer.patch
+Patch4: 	add-default-link-flags-for-shared-libraries.patch
+Patch5: 	0001-mstflint-crash-when-compiled-with-CXXFLAGS-Wp-D_GLIB.patch
 Patch6: 	replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch
-
+Url:		https://github.com/Mellanox/mstflint
-BuildRequires:	make
 BuildRequires:	libstdc++-devel, zlib-devel, libibmad-devel, gcc-c++, gcc
 BuildRequires:  libcurl-devel, boost-devel, libxml2-devel, openssl-devel
 %if %{__remake_config}
@@ -27,11 +28,13 @@ This package contains firmware update tool, vpd dump and register dump tools
 for network adapters based on Mellanox Technologies chips.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
-
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1
+%patch5 -p1
 %patch6 -p1
-
 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';'
 find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
 
@@ -43,15 +46,20 @@ find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
 %make_build
 
 %install
-%make_install
+make DESTDIR=%{buildroot} install
 # Remove the devel files that we don't ship
 rm -fr %{buildroot}%{_includedir}
 find %{buildroot} -type f -name '*.la' -delete
 find %{buildroot} -type f -name '*.a' -delete
-
+# python scripts with shebang should be installed as executable
-# Mark these shared libs executable for find-debuginfo.sh to find them.
+find %{buildroot} -type f -name  test.py -exec chmod -v a+x '{}' ';'
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/Debuginfo/
+find %{buildroot} -type f -name  mstfwreset.py -exec chmod -v a+x '{}' ';'
-chmod +x %{buildroot}/%{_libdir}/mstflint/python_tools/*.so
+find %{buildroot} -type f -name  mlxfwreset_mlnxdriver.py -exec chmod -v a+x '{}' ';'
+find %{buildroot} -type f -name  mlnx_peripheral_components.py -exec chmod -v a+x '{}' ';'
+find %{buildroot} -type f -name  mlxfwreset_status_checker.py -exec chmod -v a+x '{}' ';'
+find %{buildroot} -type f -name  mcra.py -exec chmod -v a+x '{}' ';'
+find %{buildroot} -type f -name  mlxfwreset_utils.py -exec chmod -v a+x '{}' ';'
+find %{buildroot} -type f -name  pci_device.py -exec chmod -v a+x '{}' ';'
 
 %files
 %doc README
@@ -63,55 +71,6 @@ chmod +x %{buildroot}/%{_libdir}/mstflint/python_tools/*.so
 %{_mandir}/man1/*
 
 %changelog
-* Tue Oct 24 2023 Kamal Heib <kheib@redhat.com> - 4.25.0-1
-- Update to upstream release 4.25.0
-- Resolves: RHEL-931
-
-* Fri Jun 02 2023 Kamal Heib <kheib@redhat.com> - 4.24.0-1
-- Update to upstream release 4.24.0
-- Add gating tests
-- Resolves: rhbz#2170069
-
-* Wed Feb 08 2023 Michal Schmidt <mschmidt@redhat.com> - 4.23.0-2
-- Update to upstream release 4.23.0
-- Resolves: rhbz#2112936
-
-* Wed Aug 17 2022 Michal Schmidt <mschmidt@redhat.com> - 4.21.0-1
-- Update to upstream release 4.21.0
-- Resolves: rhbz#2049525
-
-* Mon Mar 28 2022 Michal Schmidt <mschmidt@redhat.com> - 4.19.0-0.3
-- Rebase to the almost released 4.19.0
-- Resolves: rhbz#2045017
-
-* Sun Dec 05 2021 Honggang Li <honli@redhat.com> - 4.18.0-1
-- Rebase mstflint to latest upstream release v4.18.0-1
-- Resolves: rhbz#1982202
-
-* Thu Jul 01 2021 Honggang Li <honli@redhat.com> - 4.17.0-1
-- Rebase mstflint to latest upstream release v4.17.0-1
-- Resolves: bz1915313
-
-* Thu Nov 05 2020 Honggang Li <honli@redhat.com> - 4.15.0-1
-- Rebase to latest upstream release v4.15.0-1
-- Resolves: bz1851723
-
-* Thu Apr 16 2020 Honggang Li <honli@redhat.com> - 4.14.0-1
-- Rebase to latest upstream release v4.14.0-1
-- Resolves: bz1789386
-
-* Thu Jan 16 2020 Honggang Li <honli@redhat.com> - 4.13.3-2
-- Rebase to latest upstream release v4.13.3-2
-- Resolves: bz1788927
-
-* Wed Oct 30 2019 Honggang Li <honli@redhat.com> - 4.13.1-1
-- Rebase to latest upstream release v4.13.1-1
-- Resolves: bz1722258
-
-* Thu Jun 13 2019 Honggang Li <honli@redhat.com> - 4.12.0-1
-- Rebase to latest upstream release v4.12.0-1
-- Resolves: bz1683083
-
 * Fri Feb  1 2019 Honggang Li <honli@redhat.com> - 4.11.0-2
 - Rebase to latest upstream release v4.11.0-2
 - Resolves: bz1634777