.gitignore

@@ -1 +1 @@
-SOURCES/mstflint-4.18.0-1.tar.gz
+SOURCES/mstflint-4.25.0-1.tar.gz

.mstflint.metadata

@@ -1 +0,0 @@
-62bda99ff2f53d36a44ab98ab10a78572ce7f0d2 SOURCES/mstflint-4.18.0-1.tar.gz

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

@@ -1,5 +1,18 @@
+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 9807603..b23bcb9 100644
+index b6c43d59c8b5..0e03839459f2 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
@@ -12,7 +25,7 @@ index 9807603..b23bcb9 100644
  
  CLEANFILES = ${CCMDIF_SO}
 diff --git a/dev_mgt/Makefile.am b/dev_mgt/Makefile.am
-index 1fbd142..df5b14a 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,7 +38,7 @@ index 1fbd142..df5b14a 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 934b803..c8af0c2 100644
+index 934b8030a229..c8af0c2d5dac 100644
 --- a/mtcr_py/Makefile.am
 +++ b/mtcr_py/Makefile.am
 @@ -40,7 +40,7 @@ MTCR_DIR = $(USER_DIR)/${MTCR_CONF_DIR}
@@ -38,15 +51,18 @@ index 934b803..c8af0c2 100644
  CLEANFILES = cmtcr.so
  
 diff --git a/reg_access/Makefile.am b/reg_access/Makefile.am
-index 26f6a5a..9a42c37 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
+@@ -56,7 +56,7 @@ reg_access_pylib_DATA = ${RREG_ACCESS_SO} regaccess.py regaccess_structs.py
- dist_reg_access_pylib_DATA = regaccess.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
+

SPECS/mstflint.spec

@@ -2,14 +2,16 @@
 
 Name:		mstflint
 Summary:	Mellanox firmware burning tool
-Version:	4.18.0
+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.18.0-1/mstflint-4.18.0-1.tar.gz
+
 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
@@ -25,9 +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 -n mstflint-4.18.0
+%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 '{}' ';'
 
@@ -45,6 +49,10 @@ 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/*
@@ -55,6 +63,27 @@ 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