Sync changes to SLFO-1.2 branch

OBS-URL: https://build.opensuse.org/request/show/1292064
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mstflint?expand=0&rev=30

Fix-gcc7-and-gcc8.patch

@@ -1,4 +1,4 @@
-commit f5644b3f62db9edc49929a5d62fc03bd7fe542ed
+commit 6a8758e9353447abdb9366638790984e84b04eb1
 Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
 Date:   Wed Aug 9 17:31:57 2017 +0200
 
@@ -9,18 +9,18 @@ Date:   Wed Aug 9 17:31:57 2017 +0200
     Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
 
 diff --git configure.ac configure.ac
-index 366d9a115693..dc356443f2cc 100644
+index 4d549ee4cb79..c8e15447f5e1 100644
 --- configure.ac
 +++ configure.ac
-@@ -604,6 +604,7 @@ AC_SEARCH_LIBS([sqlite3_initialize], [sqlite3], [SQLITE_SYSTEM_AVAILABLE="yes"],
- AM_CONDITIONAL([USE_LOCAL_SQLITE], [test "$SQLITE_SYSTEM_AVAILABLE" = no])
+@@ -308,6 +308,7 @@ AM_CONDITIONAL([USE_LOCAL_SQLITE], [test "$SQLITE_SYSTEM_AVAILABLE" = no])
+ 
  
  CFLAGS="$CFLAGS -DMST_UL"
 +CPPFLAGS="$CPPFLAGS -DMST_UL"
  CXXFLAGS="$CXXFLAGS -DMST_UL"
  
- CCVER=`${CC} --version | grep ${CC} | grep -E -o "( )[[4-9]]\.[[0-9]]\.[[0-9]]" | head -1`
-@@ -631,6 +632,14 @@ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [CFLAGS="$CFLAGS -Wno-implici
+ 
+@@ -336,6 +337,14 @@ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [CFLAGS="$CFLAGS -Wno-implici
  AX_CHECK_COMPILE_FLAG([-Wno-cast-function-type], [CFLAGS="$CFLAGS -Wno-cast-function-type"], [], [])
  CFLAGS="$OLD_CFLAGS"
  

PIE.patch

@@ -1,4 +1,4 @@
-commit 77ebcfe7e1c1d5a3037761aa64de6f9ca32361d7
+commit da607dd93fc67a63029d08f868e1e1c2c70e9663
 Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
 Date:   Fri Jul 9 13:01:55 2021 +0200
 
@@ -9,19 +9,16 @@ Date:   Fri Jul 9 13:01:55 2021 +0200
     Signed-off-by: Hardware error from APEI Generic Hardware Error Source: 0
 
 diff --git configure.ac configure.ac
-index dc356443f2cc..ef5fc5584e6a 100644
+index 35049bcbbed4..273ce3186936 100644
 --- configure.ac
 +++ configure.ac
-@@ -104,6 +104,12 @@ else
-     fi
- fi
+@@ -59,6 +59,9 @@ LDL=""
+ default_en_inband=""
  
-+# All bin programs are linked using LDL
-+# reuse this instead of LDFLAGS as it would mess
-+# up shared lib builds
+ LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/local/lib64 -L/usr/lib64"
 +if test "$host_cpu" != "s390x"; then
-+	LDL="${LDL} -pie"
++	LDFLAGS="${LDFLAGS} -pie"
 +fi
- 
- AC_SUBST(MTCR_CONF_DIR)
- AC_SUBST(VFIO_DRIVER_DIR)
+ CXXFLAGS="${CXXFLAGS} -isystem /usr/local/include" 
+ if test "x$OS" = "xFreeBSD"; then
+     AC_MSG_NOTICE(FreeBSD Build)

README.md

@@ -1,12 +0,0 @@
-
-## Build Results
-
-Current state of mstflint in openSUSE:Factory is
-
-![Factory build results](https://br.opensuse.org/status/openSUSE:Factory/mstflint/standard)
-
-The current state of mstflint in the devel project build (science:HPC)
-
-![Devel project build results](https://br.opensuse.org/status/science:HPC/mstflint)
-
-

Remove-date-time-info-from-build.patch

@@ -0,0 +1,24 @@
+commit 59982ffad738c25082053bb4a87aa7fb97ebc796
+Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
+Date:   Fri Sep 30 14:10:47 2022 +0200
+
+    Remove date/time info from build
+    
+    Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
+
+diff --git common/tools_version.h common/tools_version.h
+index c656076c13b4..021da5429402 100644
+--- common/tools_version.h
++++ common/tools_version.h
+@@ -74,8 +74,9 @@ static inline int get_version_string(char* buf, int buf_size, const char* exe_na
+         len = snprintf(buf, buf_size, "%s %s, ", exe_name, tool_version);
+     }
+     // cut out first and last "$" from the SVN version string:
+-    len += snprintf(buf + len, buf_size - len, "%s, built on %s, %s. Git SHA Hash: %s", MSTFLINT_VERSION_STR, __DATE__,
+-                    __TIME__, TOOLS_GIT_SHA);
++    len += snprintf(buf + len, buf_size - len, "%s. Git SHA Hash: %s",
++                    MSTFLINT_VERSION_STR,
++                    TOOLS_GIT_SHA);
+     return len;
+ }
+ 

_service

@@ -1,17 +0,0 @@
-<services>
-  <service name="tar_scm" mode="manual">
-    <param name="scm">git</param>
-    <param name="url">https://github.com/Mellanox/mstflint.git</param>
-    <param name="package-meta">no</param>
-    <param name="exclude">.git</param>
-    <param name="filename">mstflint</param>
-    <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="versionrewrite-replacement">\1</param>
-    <param name="revision">9ed9e8c36608035769534e7450d1885483df8eaf</param>
-  </service>
-  <service name="recompress" mode="manual">
-    <param name="file">*mstflint*.tar</param>
-    <param name="compression">gz</param>
-  </service>
-</services>

fix-race-condition-during-install.patch

@@ -0,0 +1,21 @@
+commit 77d8c2e2d7de83dc8202d99bb995c423299229fb
+Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
+Date:   Mon Oct 15 09:33:09 2018 +0200
+
+    fix race condition during install
+    
+    Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
+
+diff --git dev_mgt/Makefile.am dev_mgt/Makefile.am
+index 3118b85f97a4..193abaf79e11 100644
+--- dev_mgt/Makefile.am
++++ dev_mgt/Makefile.am
+@@ -46,7 +46,7 @@ libdev_mgt_a_SOURCES = \
+ 
+ dev_mgt_pylibdir = $(libdir)/mstflint/python_tools/
+ 
+-dev_mgt_pylib_DATA = c_dev_mgt.so dev_mgt.py
++dev_mgt_pylib_DATA = c_dev_mgt.so
+ dist_dev_mgt_pylib_DATA = dev_mgt.py
+ 
+ c_dev_mgt.so: libdev_mgt.a

mstflint.changes

@@ -1,61 +1,7 @@
 -------------------------------------------------------------------
-Tue Nov 18 16:42:34 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
+Thu Mar 27 09:59:21 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
 
-- Add _service to fetch from git directly
-- Update to mstflint-4.33.0-1.60.9ed9e8c3
-  - See https://github.com/Mellanox/mstflint/releases/tag/v4.33.0-1
-- Drop patches merged upstream:
-  - Remove-date-time-info-from-build.patch
-  - fix-race-condition-during-install.patch
-  - GCC15-C23-support.patch
-  - mflash-add-missing-stlib-include.patch
-- Refresh patches against new sources:
-  - Fix-gcc7-and-gcc8.patch
-  - PIE.patch
-
--------------------------------------------------------------------
-Fri Jul 11 06:41:42 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
-
-- Add GCC15-C23-support.patch to fix compilation with GCC >= 15
-
--------------------------------------------------------------------
-Thu Sep  5 12:11:14 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
-
-- Add mflash-add-missing-stlib-include.patch to fix compilation
-  with GCC >= 14
-
--------------------------------------------------------------------
-Thu Feb 22 13:26:27 UTC 2024 - pgajdos@suse.com
-
-- Use %patch -P N instead of deprecated %patchN.
-
--------------------------------------------------------------------
-Thu Sep 28 13:48:49 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
-
-- Update to 4.25.0
-  https://github.com/Mellanox/mstflint/files/12317054/MSTFLINT.Package.-Firmware.Burning.and.Diagnostics.Tools.Documentation.v4.25.0.pdf
-- Refresh fix-race-condition-during-install.patch to handle new race conditions
-
--------------------------------------------------------------------
-Mon Jul 17 10:01:00 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
-
-- Update to 4.24.0
-  https://github.com/Mellanox/mstflint/releases/download/v4.24.0-1/MSTFLINT.Package.-Firmware.Burning.and.Diagnostics.Tools.Documentation.v4.24.0.pdf
-- Refresh fix-race-condition-during-install.patch to handle new race conditions
-
--------------------------------------------------------------------
-Wed Jun  7 11:59:17 UTC 2023 - pgajdos@suse.com
-
-- version update to 4.23.0
-  https://github.com/Mellanox/mstflint/releases/download/v4.23.0-1/MSTFLINT.Package.-Firmware.Burning.and.Diagnostics.Tools.Documentation.v4.23.0.pdf
-- modified patches
-  % PIE.patch (refreshed)
-
--------------------------------------------------------------------
-Mon Oct 17 13:58:26 UTC 2022 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
-
-- Updated fix-race-condition-during-install.patch to fix another
-  race condition during install
+- Use %autosetup to work with rpm-4.20 (bsc#1240154)
 
 -------------------------------------------------------------------
 Fri Sep 30 12:11:40 UTC 2022 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>

mstflint.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mstflint
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,20 +16,21 @@
 #
 
 
-%define git_ver -1.60.9ed9e8c3
+%define extra_version -1
 
 Name:           mstflint
-Version:        4.33.0
+Version:        4.21.0
 Release:        0
 Summary:        Mellanox Firmware Burning and Diagnostics Tools
 License:        BSD-2-Clause OR GPL-2.0-only
 Group:          System/Console
 URL:            http://www.openfabrics.org
 Obsoletes:      mstflint-devel < %{version}
-Source:         mstflint-%{version}%{?git_ver}.tar.gz
-Source100:      README.md
-Patch1:         Fix-gcc7-and-gcc8.patch
-Patch2:         PIE.patch
+Source:         https://github.com/Mellanox/mstflint/releases/download/v%{version}%{extra_version}/mstflint-%{version}%{extra_version}.tar.gz
+Patch1:         Remove-date-time-info-from-build.patch
+Patch4:         Fix-gcc7-and-gcc8.patch
+Patch5:         fix-race-condition-during-install.patch
+Patch6:         PIE.patch
 BuildRequires:  gcc-c++
 BuildRequires:  infiniband-diags-devel
 BuildRequires:  libibverbs-devel
@@ -48,7 +49,7 @@ package. For a full documentation of the MFT package, please refer to
 the downloads page at the Mellanox web site.
 
 %prep
-%autosetup -p0 -n %{name}-%{version}%{git_ver}
+%autosetup -p0
 
 %build
 ./autogen.sh
@@ -68,19 +69,16 @@ rm -rf %{buildroot}%{_bindir}/hca_self_test.ofed
 %license LICENSE COPYING
 %{_bindir}/mstconfig
 %{_bindir}/mstcongestion
-%{_bindir}/mstdevices_info
 %{_bindir}/mstflint
-%{_bindir}/mstfwctrl
 %{_bindir}/mstfwreset
 %{_bindir}/mstmcra
-%{_bindir}/mstmget_temp
 %{_bindir}/mstmread
 %{_bindir}/mstmtserver
 %{_bindir}/mstmwrite
+%{_bindir}/mstprivhost
 %{_bindir}/mstregdump
 %{_bindir}/mstresourcedump
 %{_bindir}/mstresourceparse
-%{_bindir}/msttokengenerator
 %{_bindir}/mstvpd
 %{_bindir}/mstfwtrace
 %{_mandir}/man1/*.1%{ext_man}