.gitignore

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

.mstflint.metadata

@@ -1 +0,0 @@
-d77fe8bf03a63ef51ff362c9f6367c2657e0b2c9 SOURCES/mstflint-4.13.3-2.tar.gz

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

@@ -1,42 +0,0 @@
-From 8a54316a15c76154d307ba53be5d98b8503a5d5f Mon Sep 17 00:00:00 2001
-From: Honggang Li <honli@redhat.com>
-Date: Thu, 13 Jun 2019 20:58:50 -0400
-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>
----
- tracers/fwtrace/mstfwtrace.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tracers/fwtrace/mstfwtrace.py b/tracers/fwtrace/mstfwtrace.py
-index 3c3ef8f..5193a31 100755
---- a/tracers/fwtrace/mstfwtrace.py
-+++ b/tracers/fwtrace/mstfwtrace.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- # --
- # 
- # Copyright (C) 2019 Mellanox Technologies Ltd. All rights reserved.
--- 
-2.20.1
-

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

@@ -1,8 +1,21 @@
+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 0d8f53b..d800302 100644
+index b6c43d59c8b5..0e03839459f2 100644
 --- a/cmdif/Makefile.am
 +++ b/cmdif/Makefile.am
-@@ -50,7 +50,7 @@ libcmdif_a_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common.h
+@@ -51,7 +51,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
@@ -12,7 +25,7 @@ index 0d8f53b..d800302 100644
  
  CLEANFILES = ${CCMDIF_SO}
 diff --git a/dev_mgt/Makefile.am b/dev_mgt/Makefile.am
-index 3118b85..e708ad8 100644
+index 2283c2d1c763..ab8910dfc435 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
@@ -25,155 +38,31 @@ index 3118b85..e708ad8 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 5f5677d..566a870 100644
+index 934b8030a229..c8af0c2d5dac 100644
 --- a/mtcr_py/Makefile.am
 +++ b/mtcr_py/Makefile.am
-@@ -39,7 +39,7 @@ MTCR_DIR = $(USER_DIR)/${MTCR_CONF_DIR}
+@@ -40,7 +40,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
-+	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so
+-	$(CC) -g -Wall -pthread -shared ${CFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so $(MFT_CORE_LIB_LINK)
++	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so $(MFT_CORE_LIB_LINK)
  
  CLEANFILES = cmtcr.so
  
-diff --git a/mvpd/Makefile.am b/mvpd/Makefile.am
-index e9fa5c6..fab1599 100755
---- a/mvpd/Makefile.am
-+++ b/mvpd/Makefile.am
-@@ -1,61 +1,61 @@
--#--
--# 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.
--#--
--
--# Makefile.am -- Process this file with automake to produce Makefile.in
--MTCR_DIR = $(top_srcdir)/${MTCR_CONF_DIR}
--COMMON_DIR = $(top_srcdir)/common
--LAYOUTS_DIR = $(top_srcdir)/tools_layouts
--USER_DIR = $(top_srcdir)
--
--AM_CPPFLAGS = -I. -I$(USER_DIR) -I$(srcdir) -I$(LAYOUTS_DIR) -I$(USER_DIR)/include/mtcr_ul
--AM_CFLAGS = -W -Wall -g -MP -MD $(COMPILER_FPIC)
--
--noinst_LTLIBRARIES = libmvpd.a
--
--libmvpd_a_SOURCES =  mvpd.c mvpd.h
--
--libmvpd_a_DEPENDENCIES = $(MTCR_DIR)/libmtcr_ul.a
--libmvpd_a_LIBADD = $(libmvpd_a_DEPENDENCIES)
--
--RMVPD_SO = rmvpd.so
--
--		  
--LDADD= ../${MTCR_CONF_DIR}/libmtcr_ul.a ${LDL}
--
--
--noinst_HEADERS = mvpd.h
--
--${RMVPD_SO}: libmvpd.a
--	$(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${RMVPD_SO} \
--	 -L$(MTCR_DIR) -lmtcr_ul
--	
--CLEANFILES = ${RMVPD_SO}
-+#--
-+# 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.
-+#--
-+
-+# Makefile.am -- Process this file with automake to produce Makefile.in
-+MTCR_DIR = $(top_srcdir)/${MTCR_CONF_DIR}
-+COMMON_DIR = $(top_srcdir)/common
-+LAYOUTS_DIR = $(top_srcdir)/tools_layouts
-+USER_DIR = $(top_srcdir)
-+
-+AM_CPPFLAGS = -I. -I$(USER_DIR) -I$(srcdir) -I$(LAYOUTS_DIR) -I$(USER_DIR)/include/mtcr_ul
-+AM_CFLAGS = -W -Wall -g -MP -MD $(COMPILER_FPIC)
-+
-+noinst_LTLIBRARIES = libmvpd.a
-+
-+libmvpd_a_SOURCES =  mvpd.c mvpd.h
-+
-+libmvpd_a_DEPENDENCIES = $(MTCR_DIR)/libmtcr_ul.a
-+libmvpd_a_LIBADD = $(libmvpd_a_DEPENDENCIES)
-+
-+RMVPD_SO = rmvpd.so
-+
-+		  
-+LDADD= ../${MTCR_CONF_DIR}/libmtcr_ul.a ${LDL}
-+
-+
-+noinst_HEADERS = mvpd.h
-+
-+${RMVPD_SO}: libmvpd.a
-+	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} *.o -o ${RMVPD_SO} \
-+	 -L$(MTCR_DIR) -lmtcr_ul
-+	
-+CLEANFILES = ${RMVPD_SO}
 diff --git a/reg_access/Makefile.am b/reg_access/Makefile.am
-index f28290e..a141704 100644
+index c33bac653620..a231a6cd57e1 100644
 --- a/reg_access/Makefile.am
 +++ b/reg_access/Makefile.am
-@@ -53,7 +53,7 @@ reg_access_pylib_DATA = ${RREG_ACCESS_SO} regaccess.py
- dist_reg_access_pylib_DATA = regaccess.py
+@@ -56,7 +56,7 @@ reg_access_pylib_DATA = ${RREG_ACCESS_SO} regaccess.py regaccess_structs.py
+ dist_reg_access_pylib_DATA = regaccess.py regaccess_structs.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 -L$(MTCR_DIR) -lmtcr_ul
+ 	-L$(USER_DIR)/tools_layouts -ltools_layouts -lmlxconfig_4th_gen_layouts -L$(MTCR_DIR) -lmtcr_ul
  
  CLEANFILES = ${RREG_ACCESS_SO}
+-- 
+2.41.0
+

SOURCES/extend-buffer.patch

@@ -1,13 +0,0 @@
-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 9dd3afd..076879a 100755
+index 420b82f..0a20bcd 100644
 --- a/flint/subcommands.cpp
 +++ b/flint/subcommands.cpp
-@@ -3103,7 +3103,7 @@ FlintStatus SgSubCommand::sgFs2()
+@@ -4484,7 +4484,7 @@ FlintStatus SgSubCommand::sgFs2()
      return FLINT_SUCCESS;
  }
  
@@ -11,3 +11,16 @@ index 9dd3afd..076879a 100755
  
  FlintStatus SgSubCommand::sgFs3()
  {
+diff --git a/mlxfwops/lib/flint_base.h b/mlxfwops/lib/flint_base.h
+index f3edc43..a85e43d 100644
+--- a/mlxfwops/lib/flint_base.h
++++ b/mlxfwops/lib/flint_base.h
+@@ -364,7 +364,7 @@ struct GPH {
+ 
+ #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 REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mstfwreset or reboot machine."
+ #endif

SPECS/mstflint.spec

@@ -2,16 +2,17 @@
 
 Name:		mstflint
 Summary:	Mellanox firmware burning tool
-Version:	4.13.3
-Release:	2%{?dist}
+Version:	4.25.0
+Release:	1%{?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.13.3-2/mstflint-4.13.3-2.tar.gz
-Patch2: 	0001-Fix-shebang-for-python-scripts.patch
-Patch3: 	extend-buffer.patch
-Patch4: 	add-default-link-flags-for-shared-libraries.patch
+
+Patch4:	add-default-link-flags-for-shared-libraries.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}
@@ -26,11 +27,11 @@ This package contains firmware update tool, vpd dump and register dump tools
 for network adapters based on Mellanox Technologies chips.
 
 %prep
-%setup -q
-%patch2 -p1
-%patch3 -p1
+%setup -q -n %{name}-%{version}
+
 %patch4 -p1
 %patch6 -p1
+
 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';'
 find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
 
@@ -42,12 +43,16 @@ find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
 %make_build
 
 %install
-make DESTDIR=%{buildroot} install
+%make_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
 
+# Mark these shared libs executable for find-debuginfo.sh to find them.
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/Debuginfo/
+chmod +x %{buildroot}/%{_libdir}/mstflint/python_tools/*.so
+
 %files
 %doc README
 %_bindir/*
@@ -58,6 +63,43 @@ find %{buildroot} -type f -name '*.a' -delete
 %{_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