!42 fix strip problem

From: @Venland 
Reviewed-by: @wu-leilei 
Signed-off-by: @wu-leilei

0001-Fix-compile-errors.patch

@@ -1,4 +1,4 @@
-From a6ab27b854a63983403ee4376a0303629267c6c1 Mon Sep 17 00:00:00 2001
+From 8dad60feacfc28d092a0de066eba4e2a41dfe616 Mon Sep 17 00:00:00 2001
 From: lizhenhua <lizhenhua@sina.com>
 Date: Wed, 20 May 2020 13:49:21 +0800
 Subject: [PATCH] Fix compile errors
@@ -6,88 +6,93 @@ Subject: [PATCH] Fix compile errors
 ---
  ext_libs/muparser/muParserCallback.cpp | 16 ++++++++++++++++
  ext_libs/muparser/muParserCallback.h   |  1 +
- mlxfwops/lib/fw_ops.cpp                |  6 +++---
+ mlxfwops/lib/fw_ops.cpp                | 10 +++-------
  small_utils/mtserver.c                 |  4 ++--
- 4 files changed, 22 insertions(+), 5 deletions(-)
+ 4 files changed, 22 insertions(+), 9 deletions(-)
 
 diff --git a/ext_libs/muparser/muParserCallback.cpp b/ext_libs/muparser/muParserCallback.cpp
-index 2044fe1..27c5b08 100755
+index 8db3c1d..2040efe 100644
 --- a/ext_libs/muparser/muParserCallback.cpp
 +++ b/ext_libs/muparser/muParserCallback.cpp
-@@ -386,6 +386,22 @@ namespace mu
+@@ -392,6 +392,22 @@ ParserCallback::ParserCallback(const ParserCallback& ref)
-     m_eOprtAsct  = ref.m_eOprtAsct;
+     m_eOprtAsct = ref.m_eOprtAsct;
-   }
+ }
  
-+  ParserCallback& ParserCallback::operator=(const ParserCallback& cb)
++ParserCallback& ParserCallback::operator=(const ParserCallback& cb)
-+  {
++{
-+    if (this != &cb)
++     if (this != &cb)
-+    {
++     {
-+      m_pFun       = cb.m_pFun;
++       m_pFun       = cb.m_pFun;
-+      m_iArgc      = cb.m_iArgc;
++       m_iArgc      = cb.m_iArgc;
-+      m_bAllowOpti = cb.m_bAllowOpti;
++       m_bAllowOpti = cb.m_bAllowOpti;
-+      m_iCode      = cb.m_iCode;
++       m_iCode      = cb.m_iCode;
-+      m_iType      = cb.m_iType;
++       m_iType      = cb.m_iType;
-+      m_iPri       = cb.m_iPri;
++       m_iPri       = cb.m_iPri;
-+      m_eOprtAsct  = cb.m_eOprtAsct;
++       m_eOprtAsct  = cb.m_eOprtAsct;
-+    }
++     }
 +
-+    return *this;
++     return *this;
-+  }
++}
 +
-   //---------------------------------------------------------------------------
+ //---------------------------------------------------------------------------
-   /** \brief Clone this instance and return a pointer to the new instance. */
+ /** \brief Clone this instance and return a pointer to the new instance. */
-   ParserCallback* ParserCallback::Clone() const
+ ParserCallback* ParserCallback::Clone() const
 diff --git a/ext_libs/muparser/muParserCallback.h b/ext_libs/muparser/muParserCallback.h
-index ef32b49..e8e274d 100755
+index d756099..913e059 100644
 --- a/ext_libs/muparser/muParserCallback.h
 +++ b/ext_libs/muparser/muParserCallback.h
-@@ -81,6 +81,7 @@ public:
+@@ -80,6 +80,7 @@ public:
      ParserCallback(strfun_type3 a_pFun, bool a_bAllowOpti);
      ParserCallback();
-     ParserCallback(const ParserCallback &a_Fun);
+     ParserCallback(const ParserCallback& a_Fun);
 +    ParserCallback& operator=(const ParserCallback& cb);
-     
+ 
      ParserCallback* Clone() const;
  
 diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp
-index fc06c50..4d7bcdf 100644
+index ea3ca19..d26d6c7 100644
 --- a/mlxfwops/lib/fw_ops.cpp
 +++ b/mlxfwops/lib/fw_ops.cpp
-@@ -768,16 +768,16 @@ void FwOperations::BackUpFwParams(fw_ops_params_t& fwParams)
+@@ -879,21 +879,17 @@ void FwOperations::BackUpFwParams(fw_ops_params_t& fwParams)
-     _fwParams.errBuff = (char*)NULL;
      _fwParams.errBuffSize = 0;
-     _fwParams.fileHndl = (fwParams.hndlType == FHT_FW_FILE && fwParams.fileHndl) ? \
+     _fwParams.fileHndl =
--                         strncpy((char*)(new char[(strlen(fwParams.fileHndl) + 1)]), fwParams.fileHndl, strlen(fwParams.fileHndl) + 1) : (char*)NULL;
+       (fwParams.hndlType == FHT_FW_FILE && fwParams.fileHndl) ?
-+                         (char*)memmove((new char[(strlen(fwParams.fileHndl) + 1)]), fwParams.fileHndl, strlen(fwParams.fileHndl) + 1) : (char*)NULL;
+-        strncpy((char*)(new char[(strlen(fwParams.fileHndl) + 1)]), fwParams.fileHndl, strlen(fwParams.fileHndl) + 1) :
+-        (char*)NULL;
++      (char*)memmove((new char[(strlen(fwParams.fileHndl) + 1)]), fwParams.fileHndl, strlen(fwParams.fileHndl) + 1) : (char*)NULL;
      // no support for flash params
      _fwParams.flashParams = (flash_params_t*)NULL;
      _fwParams.forceLock = fwParams.forceLock;
      _fwParams.ignoreCacheRep = fwParams.ignoreCacheRep;
-     _fwParams.mstHndl = (fwParams.hndlType == FHT_MST_DEV && fwParams.mstHndl) ? \
+     _fwParams.mstHndl =
--                        strncpy((char*)(new char[(strlen(fwParams.mstHndl) + 1)]), fwParams.mstHndl, strlen(fwParams.mstHndl) + 1) : (char*)NULL;
+       (fwParams.hndlType == FHT_MST_DEV && fwParams.mstHndl) ?
-+                        (char*)memmove((new char[(strlen(fwParams.mstHndl) + 1)]), fwParams.mstHndl, strlen(fwParams.mstHndl) + 1) : (char*)NULL;
+-        strncpy((char*)(new char[(strlen(fwParams.mstHndl) + 1)]), fwParams.mstHndl, strlen(fwParams.mstHndl) + 1) :
+-        (char*)NULL;
++      (char*)memmove((new char[(strlen(fwParams.mstHndl) + 1)]), fwParams.mstHndl, strlen(fwParams.mstHndl) + 1) : (char*)NULL;
      _fwParams.noFlashVerify = fwParams.noFlashVerify;
      _fwParams.numOfBanks = fwParams.numOfBanks;
--    _fwParams.psid = fwParams.psid ? strncpy((char*)(new char[(strlen(fwParams.psid) + 1)]), fwParams.psid, strlen(fwParams.psid) + 1) : (char*)NULL;
+-    _fwParams.psid = fwParams.psid ? strncpy((char*)(new char[(strlen(fwParams.psid) + 1)]), fwParams.psid,
+-                                             strlen(fwParams.psid) + 1) :
+-                                     (char*)NULL;
 +    _fwParams.psid = fwParams.psid ? (char*)memmove((new char[(strlen(fwParams.psid) + 1)]), fwParams.psid, strlen(fwParams.psid) + 1) : (char*)NULL;
      _fwParams.readOnly = fwParams.readOnly;
      _fwParams.shortErrors = fwParams.shortErrors;
      _fwParams.uefiExtra = fwParams.uefiExtra;
 diff --git a/small_utils/mtserver.c b/small_utils/mtserver.c
-index 143c1f4..335a5ff 100644
+index d75ec2e..8026ce5 100644
 --- a/small_utils/mtserver.c
 +++ b/small_utils/mtserver.c
-@@ -420,8 +420,8 @@ int parse_i2c_cmd(char *buf, u_int8_t *addr_width, u_int8_t *slave_addr, int *si
+@@ -714,8 +714,8 @@ int parse_i2c_cmd(char* buf,
-         for (i = 0; i < *size; i++) {
+         {
              char tmp_num[10];
              // TODO: use 16 on the  strtoul
--            strncpy(tmp_num, "0x", 2);
+-            strncpy(tmp_num, "0x", 3);
 -            strncpy(tmp_num + 2, p, 2);
-+            memmove(tmp_num, "0x", 2);
++            memmove(tmp_num, "0x", 3);
 +            memmove(tmp_num + 2, p, 2);
              tmp_num[4] = '\0';
              ((u_int8_t*)data)[i] = (u_int8_t)strtoul(tmp_num, 0, 0);
              p += 2;
 -- 
-2.23.0
+2.27.0
 

backport-0001-Title-Fix-error-while-burning-mcc-enabled.patch

@@ -1,33 +0,0 @@
-From e8d9ff786a04eb142ce6f3c8650ea975bbe595e2 Mon Sep 17 00:00:00 2001
-From: Samer Deeb <samerd@mellanox.com>
-Date: Mon, 12 Nov 2018 20:39:36 +0000
-Subject: [PATCH] Title: Fix error while burning mcc enabled Description:
- ignore HMAC calculation Issue: 1472385
-
-Signed-off-by: Samer Deeb <samerd@mellanox.com>
----
- mlxfwops/lib/fs3_ops.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mlxfwops/lib/fs3_ops.cpp b/mlxfwops/lib/fs3_ops.cpp
-index deb4a05..b5a9d93 100644
---- a/mlxfwops/lib/fs3_ops.cpp
-+++ b/mlxfwops/lib/fs3_ops.cpp
-@@ -3316,12 +3316,12 @@ bool Fs3Operations::AddHMACIfNeeded(Fs3Operations* imageOps, Flash *f)
-         }
-     }
- 
--    return true;
- #else
-     (void)imageOps;
-     (void)f;
--    return errmsg("HMAC calculation is not implemented\n");
-+    //ignore
- #endif
-+    return true;
- }
- 
- bool Fs3Operations::DoAfterBurnJobs(const u_int32_t magic_patter[],
--- 
-2.21.0
-

fix-return-local-addr.patch

@@ -1,12 +1,12 @@
-diff -urN ./ext_libs2/sqlite/sqlite3.c ./ext_libs/sqlite/sqlite3.c
+diff -Nur a/ext_libs/sqlite/sqlite3.c b/ext_libs/sqlite/sqlite3.c
---- ./ext_libs2/sqlite/sqlite3.c	2021-08-05 09:37:16.410250283 +0800
+--- a/ext_libs/sqlite/sqlite3.c	2023-10-09 17:31:40.829134845 +0800
-+++ ./ext_libs/sqlite/sqlite3.c	2021-08-05 09:36:24.801803014 +0800
++++ b/ext_libs/sqlite/sqlite3.c	2023-10-09 17:32:35.753931035 +0800
-@@ -112969,7 +112969,7 @@
+@@ -134302,7 +134302,7 @@
-   Expr *pLimit,         /* LIMIT value.  NULL means not used */
+   u32 selFlags,         /* Flag parameters, such as SF_Distinct */
-   Expr *pOffset         /* OFFSET value.  NULL means no offset */
+   Expr *pLimit          /* LIMIT value.  NULL means not used */
  ){
--  Select *pNew;
+-  Select *pNew, *pAllocated;
-+  static Select *pNew;
++  static Select *pNew, *pAllocated;
    Select standin;
-   sqlite3 *db = pParse->db;
+   pAllocated = pNew = sqlite3DbMallocRawNN(pParse->db, sizeof(*pNew) );
-   pNew = sqlite3DbMallocRawNN(db, sizeof(*pNew) );
+   if( pNew==0 ){

mstflint.spec

@@ -1,16 +1,14 @@
 Name:           mstflint
 Summary:        Firmware Burning and Diagnostics Tools
-Version:        4.10.0
+Version:        4.26.0
-Release:        10
+Release:        2
 License:        GPLv2+ or BSD
 Url:            https://github.com/Mellanox/mstflint
-Source:         https://github.com/Mellanox/%{name}/releases/download/v4.10.0-2/%{name}-%{version}.tar.gz
+Source:         https://github.com/Mellanox/%{name}/releases/download/v%{version}-1/%{name}-%{version}-1.tar.gz
 Patch0000:      0001-Fix-compile-errors.patch
 Patch0001:      fix-return-local-addr.patch
-Patch0002:      backport-0001-Title-Fix-error-while-burning-mcc-enabled.patch
-Patch0003:      backport-0001-Title-Fix-errors-found-with-checkpatch-script.patch
 BuildRequires:  libstdc++-devel zlib-devel rdma-core-devel gcc-c++ gcc
-BuildRequires:  libcurl-devel boost-devel libxml2-devel openssl-devel
+BuildRequires:  libcurl-devel libxml2-devel openssl-devel
 Obsoletes:      openib-mstflint <= 1.4 openib-tvflash <= 0.9.2 tvflash <= 0.9.0
 
 %description
@@ -31,6 +29,7 @@ export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 %install
 %make_install
 strip %{buildroot}/%{_libdir}/mstflint/python_tools/*.so
+strip %{buildroot}/%{_libdir}/mstflint/sdk/*.so
 %delete_la_and_a
 
 %files
@@ -45,6 +44,21 @@ strip %{buildroot}/%{_libdir}/mstflint/python_tools/*.so
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr 08 2024 liweigang <liweiganga@uniontech.com> - 4.26.0-2
+- fix strip problem
+
+* Wed Jan 24 2024 yaoxin <yao_xin001@hoperun.com> - 4.26.0-1
+- Upgrade to 4.26.0
+
+* Mon Oct 09 2023 wulei <wu_lei@hoperun.com> - 4.25.0-1
+- Update to 4.25.0
+
+* Wed Jul 19 2023 lvxiaoqian <xiaoqian@nj.iscas.ac.cn> - 4.10.0-12
+- Add riscv patch from v4.17
+
+* Tue Jul 04 2023 Ge Wang <wang__ge@126.com> - 4.10.0-11
+- Fix build failure due to gcc updated
+
 * Thu Jan 05 2023 chenmaodong <chenmaodong@xfusion.com> - 4.10.0-10
 - Fix errors found with checkpatch script