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

PIE.patch

@@ -8,12 +8,12 @@ Date:   Fri Jul 9 13:01:55 2021 +0200
     
     Signed-off-by: Hardware error from APEI Generic Hardware Error Source: 0
 
-Index: configure.ac
+diff --git configure.ac configure.ac
-===================================================================
+index 35049bcbbed4..273ce3186936 100644
---- configure.ac.orig
+--- configure.ac
 +++ configure.ac
-@@ -91,6 +91,9 @@ AM_CONDITIONAL(KERNEL_BUILD,[test ${KERN
+@@ -59,6 +59,9 @@ LDL=""
- AC_SUBST(KERNEL_BUILD)
+ default_en_inband=""
  
  LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/local/lib64 -L/usr/lib64"
 +if test "$host_cpu" != "s390x"; then

fix-race-condition-during-install.patch

@@ -1,4 +1,4 @@
-commit f86bbb8e3d722796ac464910e8e6b79ebb638d39
+commit 77d8c2e2d7de83dc8202d99bb995c423299229fb
 Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
 Date:   Mon Oct 15 09:33:09 2018 +0200
 
@@ -7,7 +7,7 @@ Date:   Mon Oct 15 09:33:09 2018 +0200
     Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
 
 diff --git dev_mgt/Makefile.am dev_mgt/Makefile.am
-index 2283c2d1c763..2e4d7781e245 100644
+index 3118b85f97a4..193abaf79e11 100644
 --- dev_mgt/Makefile.am
 +++ dev_mgt/Makefile.am
 @@ -46,7 +46,7 @@ libdev_mgt_a_SOURCES = \
@@ -19,29 +19,3 @@ index 2283c2d1c763..2e4d7781e245 100644
  dist_dev_mgt_pylib_DATA = dev_mgt.py
  
  c_dev_mgt.so: libdev_mgt.a
-diff --git mtcr_py/Makefile.am mtcr_py/Makefile.am
-index 934b8030a229..da7d2aed878f 100644
---- mtcr_py/Makefile.am
-+++ mtcr_py/Makefile.am
-@@ -37,7 +37,7 @@ mtcr_pylibdir = $(libdir)/mstflint/python_tools/
- USER_DIR = ..
- MTCR_DIR = $(USER_DIR)/${MTCR_CONF_DIR}
- 
--mtcr_pylib_DATA = cmtcr.so mtcr.py
-+mtcr_pylib_DATA = cmtcr.so
- dist_mtcr_pylib_DATA = mtcr.py
- cmtcr.so:
- 	$(CC) -g -Wall -pthread -shared ${CFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so $(MFT_CORE_LIB_LINK)
-diff --git reg_access/Makefile.am reg_access/Makefile.am
-index c33bac653620..8783d2953a78 100644
---- reg_access/Makefile.am
-+++ reg_access/Makefile.am
-@@ -52,7 +52,7 @@ libmlxconfig_4th_gen_regsiters_a_LIBADD = $(libmlxconfig_4th_gen_regsiters_la_DE
- RREG_ACCESS_SO = rreg_access.so
- reg_access_pylibdir = $(libdir)/mstflint/python_tools/
- 
--reg_access_pylib_DATA = ${RREG_ACCESS_SO} regaccess.py regaccess_structs.py
-+reg_access_pylib_DATA = ${RREG_ACCESS_SO}
- dist_reg_access_pylib_DATA = regaccess.py regaccess_structs.py
- 
- ${RREG_ACCESS_SO}: libreg_access.a

mflash-add-missing-stlib-include.patch

@@ -1,40 +0,0 @@
-commit df180102768284a7223ada6d7243531f9e9be2c7
-Author: Nicolas Morey <nmorey@suse.com>
-Date:   Thu Sep 5 14:08:06 2024 +0200
-
-    mflash: add missing stlib include
-    
-    Add missing include to fix GCC 14 build error:
-    In file included from mflash_dev_capability.c:42:
-    mflash_dev_capability.c: In function 'get_flash_gen':
-    mflash_dev_capability.h:67:27: error: implicit declaration of function 'getenv' [-Wimplicit-function-declaration]
-       67 |         char* reacDebug = getenv("FLASH_DEBUG"); \
-          |                           ^~~~~~
-    mflash_dev_capability.c:186:5: note: in expansion of macro 'DPRINTF'
-      186 |     DPRINTF(("get_flash_gen: flash_gen = %d\n", gen));
-          |     ^~~~~~~
-    mflash_dev_capability.c:43:1: note: 'getenv' is defined in header '<stdlib.h>'; this is probably fixable by adding '#include <stdlib.h>'
-       42 | #include "mflash_dev_capability.h"
-      +++ |+#include <stdlib.h>
-       43 |
-    mflash_dev_capability.h:67:27: error: initialization of 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
-       67 |         char* reacDebug = getenv("FLASH_DEBUG"); \
-          |                           ^~~~~~
-    mflash_dev_capability.c:186:5: note: in expansion of macro 'DPRINTF'
-      186 |     DPRINTF(("get_flash_gen: flash_gen = %d\n", gen));
-          |     ^~~~~~~
-    
-    Signed-off-by: Nicolas Morey <nmorey@suse.com>
-
-diff --git mflash/mflash_dev_capability.h mflash/mflash_dev_capability.h
-index d63b7cffaf90..ce850a982d84 100644
---- mflash/mflash_dev_capability.h
-+++ mflash/mflash_dev_capability.h
-@@ -42,6 +42,7 @@
- #ifndef USER_MFLASH_MFLASH_DEV_CAPABILITY_H_
- #define USER_MFLASH_MFLASH_DEV_CAPABILITY_H_
- 
-+#include <stdlib.h>
- #include "mflash_pack_layer.h"
- 
- #ifndef UEFI_BUILD

mstflint-4.25.0-1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d81a259fafc6b7ab7f9b1946f5a2f2eb012f3f2e71097fee229c8125956f79b
-size 7473881

mstflint.changes

@@ -1,41 +1,7 @@
 -------------------------------------------------------------------
-Thu Sep  5 12:11:14 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
+Thu Mar 27 09:59:21 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
 
-- Add mflash-add-missing-stlib-include.patch to fix compilation
+- Use %autosetup to work with rpm-4.20 (bsc#1240154)
-  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
 
 -------------------------------------------------------------------
 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) 2024 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
@@ -19,7 +19,7 @@
 %define extra_version -1
 
 Name:           mstflint
-Version:        4.25.0
+Version:        4.21.0
 Release:        0
 Summary:        Mellanox Firmware Burning and Diagnostics Tools
 License:        BSD-2-Clause OR GPL-2.0-only
@@ -31,7 +31,6 @@ Patch1:         Remove-date-time-info-from-build.patch
 Patch4:         Fix-gcc7-and-gcc8.patch
 Patch5:         fix-race-condition-during-install.patch
 Patch6:         PIE.patch
-Patch7:         mflash-add-missing-stlib-include.patch
 BuildRequires:  gcc-c++
 BuildRequires:  infiniband-diags-devel
 BuildRequires:  libibverbs-devel