From 87ca8ba45923ade279a40ad47210464737ba7221 Mon Sep 17 00:00:00 2001
From: Kamal Heib <kheib@redhat.com>
Date: Wed, 31 May 2023 23:31:54 -0400
Subject: [PATCH] Update to upstream release 4.24.0

Signed-off-by: Kamal Heib <kheib@redhat.com>
---
 .gitignore         |  1 +
 mstflint-c99.patch | 47 ----------------------------------------------
 mstflint.spec      |  4 +---
 sources            |  2 +-
 4 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 mstflint-c99.patch

diff --git a/.gitignore b/.gitignore
index 3f1d3f4..427f031 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ noarch/
 /mstflint-4.20.1-1.tar.gz
 /mstflint-4.21.0-1.tar.gz
 /mstflint-4.23.0-1.tar.gz
+/mstflint-4.24.0-1.tar.gz
diff --git a/mstflint-c99.patch b/mstflint-c99.patch
deleted file mode 100644
index ee26069..0000000
--- a/mstflint-c99.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Add additional #include directives for C99 compatibility.  Avoid
-implicit declarations of cibfw_register_mfai_pack,
-cibfw_register_mfai_unpack, cibfw_register_mfai_size by including
-<tools_layouts/cibfw_layouts.h>, and of getenv by including
-<stdlib.h>.
-
-Submitted upstream: <https://github.com/Mellanox/mstflint/pull/774>
-
-diff --git a/mflash/mflash_gw.c b/mflash/mflash_gw.c
-index f296700ddaaf022a..55e5cb9d356c09f4 100644
---- a/mflash/mflash_gw.c
-+++ b/mflash/mflash_gw.c
-@@ -43,6 +43,8 @@
- #include "mflash_access_layer.h"
- #include "flash_int_defs.h"
- 
-+#include <stdlib.h>
-+
- #ifdef __WIN__
- //
- // Windows (Under DDK)
-diff --git a/mflash/mflash_new_gw.c b/mflash/mflash_new_gw.c
-index 3bd044ea327f7b9b..4d0bb21ddf1d47b4 100644
---- a/mflash/mflash_new_gw.c
-+++ b/mflash/mflash_new_gw.c
-@@ -42,6 +42,9 @@
- #include "mflash_dev_capability.h"
- #include "mflash_access_layer.h"
- #include "flash_int_defs.h"
-+
-+#include <stdlib.h>
-+
- #define DPRINTF(args)                            \
-     do                                           \
-     {                                            \
-diff --git a/reg_access/reg_access.c b/reg_access/reg_access.c
-index 622b1a151ec8dcc3..736e67b30aa7f7af 100644
---- a/reg_access/reg_access.c
-+++ b/reg_access/reg_access.c
-@@ -37,6 +37,7 @@
- #include <tools_layouts/reg_access_hca_layouts.h>
- #include <tools_layouts/reg_access_switch_layouts.h>
- #include <tools_layouts/tools_open_layouts.h>
-+#include <tools_layouts/cibfw_layouts.h>
- 
- #define REG_ID_PCNR              0x5050
- #define REG_ID_PAOS              0x5006
diff --git a/mstflint.spec b/mstflint.spec
index df5d4ce..108df1e 100644
--- a/mstflint.spec
+++ b/mstflint.spec
@@ -2,7 +2,7 @@
 
 Name:		mstflint
 Summary:	Mellanox firmware burning tool
-Version:	4.23.0
+Version:	4.24.0
 Release:	%autorelease
 License:	GPLv2+ or BSD
 Url:		https://github.com/Mellanox/%{name}
@@ -11,7 +11,6 @@ Group:		Applications/System
 
 Patch4:	add-default-link-flags-for-shared-libraries.patch
 Patch6: 	replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch
-Patch7: mstflint-c99.patch
 
 BuildRequires:	make
 BuildRequires:	libstdc++-devel, zlib-devel, libibmad-devel, gcc-c++, gcc
@@ -32,7 +31,6 @@ for network adapters based on Mellanox Technologies chips.
 
 %patch4 -p1
 %patch6 -p1
-%patch7 -p1
 
 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';'
 find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
diff --git a/sources b/sources
index 5f4ff5b..11476a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mstflint-4.23.0-1.tar.gz) = 5a5d779a7b7635128417701a059c2e2c8d4e58ff9f71950e50d6df1c583ff594cf883af1e0412d995fb8c66390884989a6c4dab0ce95bcd3bc67312be4412f2b
+SHA512 (mstflint-4.24.0-1.tar.gz) = 143dd558e9b57e26d25459885957422b650dc2cdc5b0069b77d1cda07d3da4161a57b10b7d38fffe609c23c7905611ec04834f9c06174a7ba7462dd71085c3b5