[packages/mstflint] - updated to 4.31.0[-1]
qboosh
qboosh at pld-linux.org
Sun Apr 20 22:50:58 CEST 2025
commit 8b723689638c5104357fe4905d131f561a58ecbd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Apr 20 22:50:42 2025 +0200
- updated to 4.31.0[-1]
gcc11.patch | 209 ------------------------------------------------------
mstflint.spec | 71 ++++++++++++-------
openssl-1.1.patch | 22 ------
x32.patch | 50 ++++++-------
4 files changed, 70 insertions(+), 282 deletions(-)
---
diff --git a/mstflint.spec b/mstflint.spec
index f7ed6f7..84dd2e2 100644
--- a/mstflint.spec
+++ b/mstflint.spec
@@ -1,23 +1,29 @@
Summary: Firmware burning and diagnostic tools for Mellanox HCA/NIC cards
Summary(pl.UTF-8): Narzędzia modyfikujące firmware i diagnostyczne dla kart HCA/NIC Mellanox
Name: mstflint
-Version: 4.10.0
-%define upstream_ver %{version}-3
-Release: 3
+Version: 4.31.0
+%define upstream_ver %{version}-1
+Release: 1
License: BSD or GPL v2
Group: Networking/Utilities
Source0: https://github.com/Mellanox/mstflint/releases/download/v%{upstream_ver}/%{name}-%{upstream_ver}.tar.gz
-# Source0-md5: 0fd75b78de3fc46d2cf951eead225a5b
-Patch0: openssl-1.1.patch
+# Source0-md5: 19b8dd432ba7dbec66873190ec197fc7
Patch1: x32.patch
-Patch2: gcc11.patch
URL: https://github.com/Mellanox/mstflint
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake
+BuildRequires: curl-devel
+BuildRequires: expat-devel
BuildRequires: libibmad-devel
BuildRequires: libstdc++-devel
-BuildRequires: openssl-devel
+BuildRequires: libtool >= 2:2
+BuildRequires: libxml2-devel >= 2.0
+BuildRequires: muparser-devel
+BuildRequires: openssl-devel >= 1.0.2k
+BuildRequires: xz-devel
BuildRequires: zlib-devel
# see common/compatibility.h
-ExclusiveArch: %{ix86} %{x8664} x32 aarch64 ia64 ppc ppc64
+ExclusiveArch: %{ix86} %{x8664} x32 %{arm} aarch64 e2k ia64 m68k hppa mips64 ppc ppc64 riscv
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -41,16 +47,16 @@ Pliki nagłówkowe do dostępu do kart HCA/NIC Mellanox.
%prep
%setup -q
-%patch -P0 -p1
%patch -P1 -p1
-%patch -P2 -p1
%build
%{__libtoolize}
%{__aclocal} -I m4
%{__automake}
+%{__autoheader}
%{__autoconf}
%configure \
+ --enable-adb-generic-tools \
--enable-cs \
--enable-fw-mgr \
--enable-xml2 \
@@ -71,13 +77,23 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE README
%dir %{_sysconfdir}/mstflint
%{_sysconfdir}/mstflint/ca-bundle.crt
+%attr(755,root,root) %{_bindir}/mstarchive
%attr(755,root,root) %{_bindir}/mstconfig
+%attr(755,root,root) %{_bindir}/mstdevices_info
%attr(755,root,root) %{_bindir}/mstflint
+%attr(755,root,root) %{_bindir}/mstfwctrl
+%attr(755,root,root) %{_bindir}/mstfwtrace
+%attr(755,root,root) %{_bindir}/mstlink
%attr(755,root,root) %{_bindir}/mstmcra
+%attr(755,root,root) %{_bindir}/mstmget_temp
%attr(755,root,root) %{_bindir}/mstmread
%attr(755,root,root) %{_bindir}/mstmtserver
%attr(755,root,root) %{_bindir}/mstmwrite
+%attr(755,root,root) %{_bindir}/mstprivhost
+%attr(755,root,root) %{_bindir}/mstreg
%attr(755,root,root) %{_bindir}/mstregdump
+%attr(755,root,root) %{_bindir}/mstresourcedump
+%attr(755,root,root) %{_bindir}/mstresourceparse
%attr(755,root,root) %{_bindir}/mstvpd
%attr(755,root,root) %{_bindir}/mstcongestion
%attr(755,root,root) %{_bindir}/mstfwmanager
@@ -86,35 +102,38 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/mstflint/python_tools
%attr(755,root,root) %{_libdir}/mstflint/python_tools/c_dev_mgt.so
%attr(755,root,root) %{_libdir}/mstflint/python_tools/ccmdif.so
-%{_libdir}/mstflint/python_tools/cmdif.py
%attr(755,root,root) %{_libdir}/mstflint/python_tools/cmtcr.so
-%{_libdir}/mstflint/python_tools/dev_mgt.py
-%dir %{_libdir}/mstflint/python_tools/mstfwreset
-%dir %{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib
-%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/__init__.py
-%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/logger.py
-%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/mcra.py
-%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlnx_peripheral_components.py
-%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlxfwreset_mlnxdriver.py
-%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlxfwreset_status_checker.py
-%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlxfwreset_utils.py
-%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/pci_device.py
-%{_libdir}/mstflint/python_tools/mstfwreset/mstfwreset.py
-%{_libdir}/mstflint/python_tools/mtcr.py
-%{_libdir}/mstflint/python_tools/regaccess.py
%attr(755,root,root) %{_libdir}/mstflint/python_tools/rreg_access.so
-%{_libdir}/mstflint/python_tools/tools_version.py
+%{_libdir}/mstflint/python_tools/*.py
+%{_libdir}/mstflint/python_tools/mlxpci
+%{_libdir}/mstflint/python_tools/mstfwreset
+%{_libdir}/mstflint/python_tools/mstfwtrace
+%{_libdir}/mstflint/python_tools/mstprivhost
+%{_libdir}/mstflint/python_tools/resourcetools
+%dir %{_libdir}/mstflint/sdk
+%attr(755,root,root) %{_libdir}/mstflint/sdk/libresource_dump_sdk.so
%{_datadir}/mstflint
+%{_mandir}/man1/mstarchive.1*
%{_mandir}/man1/mstconfig.1*
+%{_mandir}/man1/mstcongestion.1*
%{_mandir}/man1/mstflint.1*
+%{_mandir}/man1/mstfwmanager.1*
+%{_mandir}/man1/mstfwreset.1*
+%{_mandir}/man1/mstfwtrace.1*
+%{_mandir}/man1/mstlink.1*
%{_mandir}/man1/mstmcra.1*
%{_mandir}/man1/mstmread.1*
%{_mandir}/man1/mstmtserver.1*
%{_mandir}/man1/mstmwrite.1*
+%{_mandir}/man1/mstprivhost.1*
+%{_mandir}/man1/mstreg.1*
%{_mandir}/man1/mstregdump.1*
+%{_mandir}/man1/mstresourcedump.1*
%{_mandir}/man1/mstvpd.1*
%files devel
%defattr(644,root,root,755)
+%{_libdir}/libmtcr_ul.a
+%dir %{_libdir}/mstflint
%{_libdir}/mstflint/libmtcr_ul.a
%{_includedir}/mstflint
diff --git a/gcc11.patch b/gcc11.patch
deleted file mode 100644
index e846c96..0000000
--- a/gcc11.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-diff -ur mstflint-4.10.0/cmdif/Makefile.am mstflint-4.10.0-gcc11/cmdif/Makefile.am
---- mstflint-4.10.0/cmdif/Makefile.am 2018-08-28 15:47:44.000000000 +0200
-+++ mstflint-4.10.0-gcc11/cmdif/Makefile.am 2021-10-05 22:29:47.516870358 +0200
-@@ -37,7 +37,7 @@
- AM_CPPFLAGS = -I. -I../common -I../tools_layouts -I${MTCR_DIR} -I.. -I$(USER_DIR)/${MTCR_CONF_DIR}
- CCMDIF_SO = ccmdif.so
-
--AM_CFLAGS = -W -Wall -Werror -g -MP -MD $(COMPILER_FPIC) -DCMDIF_EXPORTS
-+AM_CFLAGS = -W -Wall -g -MP -MD $(COMPILER_FPIC) -DCMDIF_EXPORTS
- CMDIF_VERSION = 1
- noinst_LIBRARIES = libcmdif.a
-
-diff -ur mstflint-4.10.0/cmdparser/Makefile.am mstflint-4.10.0-gcc11/cmdparser/Makefile.am
---- mstflint-4.10.0/cmdparser/Makefile.am 2018-08-28 15:47:44.000000000 +0200
-+++ mstflint-4.10.0-gcc11/cmdparser/Makefile.am 2021-10-05 22:29:47.516870358 +0200
-@@ -34,7 +34,7 @@
-
- INCLUDES = -I. -I../common
-
--AM_CPPFLAGS = -W -g -MP -MD $(COMPILER_FPIC) -Werror
-+AM_CPPFLAGS = -W -g -MP -MD $(COMPILER_FPIC)
-
- noinst_LIBRARIES = libcmdparser.a
-
-diff -ur mstflint-4.10.0/configure.ac mstflint-4.10.0-gcc11/configure.ac
---- mstflint-4.10.0/configure.ac 2018-08-28 15:47:44.000000000 +0200
-+++ mstflint-4.10.0-gcc11/configure.ac 2021-10-05 22:28:09.544642065 +0200
-@@ -163,8 +163,8 @@
- LDFLAGS="$LDFLAGS -Wl,--dynamic-linker=/lib64/ld64.so.2"
- ])
-
--CFLAGS="$CFLAGS -Werror -DMST_UL"
--CXXFLAGS="$CXXFLAGS -Werror -DMST_UL"
-+CFLAGS="$CFLAGS -DMST_UL"
-+CXXFLAGS="$CXXFLAGS -DMST_UL"
-
- AC_CONFIG_FILES( mstflint.spec )
-
-diff -ur mstflint-4.10.0/ext_libs/iniParser/Makefile.am mstflint-4.10.0-gcc11/ext_libs/iniParser/Makefile.am
---- mstflint-4.10.0/ext_libs/iniParser/Makefile.am 2018-08-28 15:47:45.000000000 +0200
-+++ mstflint-4.10.0-gcc11/ext_libs/iniParser/Makefile.am 2021-10-05 22:29:47.516870358 +0200
-@@ -36,7 +36,7 @@
- MTCR_DIR = $(USER_DIR)/${MTCR_CONFIG_DIR}
- INCLUDES = -I. -I$(USER_DIR) -I$(MTCR_DIR) -I$(USER_DIR)/common
-
--AM_CFLAGS = -W -Werror -g -MP -MD ${COMPILER_FPIC}
-+AM_CFLAGS = -W -g -MP -MD ${COMPILER_FPIC}
-
- noinst_LTLIBRARIES = libiniparser.a
-
-diff -ur mstflint-4.10.0/ext_libs/json/Makefile.am mstflint-4.10.0-gcc11/ext_libs/json/Makefile.am
---- mstflint-4.10.0/ext_libs/json/Makefile.am 2018-08-28 15:47:45.000000000 +0200
-+++ mstflint-4.10.0-gcc11/ext_libs/json/Makefile.am 2021-10-05 22:29:47.516870358 +0200
-@@ -34,7 +34,7 @@
-
- USER_DIR = ../
- INCLUDES =
--AM_CPPFLAGS = -W -Werror -g -MP -MD ${COMPILER_FPIC}
-+AM_CPPFLAGS = -W -g -MP -MD ${COMPILER_FPIC}
- noinst_LTLIBRARIES = libjson.a
- libjson_a_SOURCES = json_reader.cpp json_value.cpp json_batchallocator.h json_writer.cpp json/*.h
-
-diff -ur mstflint-4.10.0/ext_libs/minixz/Makefile.am mstflint-4.10.0-gcc11/ext_libs/minixz/Makefile.am
---- mstflint-4.10.0/ext_libs/minixz/Makefile.am 2018-08-28 15:47:45.000000000 +0200
-+++ mstflint-4.10.0-gcc11/ext_libs/minixz/Makefile.am 2021-10-05 22:29:47.516870358 +0200
-@@ -34,7 +34,7 @@
-
- USER_DIR = ..
- INCLUDES = -I.
--AM_CPPFLAGS = -DXZ_DEC_ANY_CHECK -W -g -MP -MD ${COMPILER_FPIC} -Werror
-+AM_CPPFLAGS = -DXZ_DEC_ANY_CHECK -W -g -MP -MD ${COMPILER_FPIC}
- noinst_LTLIBRARIES = libminixz.a
- libminixz_a_SOURCES = xz_crc32.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c xz_config.h xz.h xz_lzma2.h xz_private.h xz_stream.h
-
-diff -ur mstflint-4.10.0/ext_libs/sqlite/Makefile.am mstflint-4.10.0-gcc11/ext_libs/sqlite/Makefile.am
---- mstflint-4.10.0/ext_libs/sqlite/Makefile.am 2018-08-28 15:47:46.000000000 +0200
-+++ mstflint-4.10.0-gcc11/ext_libs/sqlite/Makefile.am 2021-10-05 22:29:47.516870358 +0200
-@@ -31,7 +31,7 @@
- #--
- # Makefile.am -- Process this file with automake to produce Makefile.in
-
--AM_CFLAGS = -W -Werror -g -MP -MD -DSQLITE_THREADSAFE=0 ${COMPILER_FPIC}
-+AM_CFLAGS = -W -g -MP -MD -DSQLITE_THREADSAFE=0 ${COMPILER_FPIC}
-
- noinst_LIBRARIES = libsqlite3.a
- noinst_HEADERS = sqlite3.h
-diff -ur mstflint-4.10.0/fw_comps_mgr/Makefile.am mstflint-4.10.0-gcc11/fw_comps_mgr/Makefile.am
---- mstflint-4.10.0/fw_comps_mgr/Makefile.am 2018-08-28 15:47:47.000000000 +0200
-+++ mstflint-4.10.0-gcc11/fw_comps_mgr/Makefile.am 2021-10-05 22:29:47.516870358 +0200
-@@ -46,9 +46,9 @@
-
- FWCOMPS_VERSION = 1
-
--AM_CFLAGS = -MD -pipe -Wall -W -Werror $(COMPILER_FPIC)
-+AM_CFLAGS = -MD -pipe -Wall -W $(COMPILER_FPIC)
-
--AM_CXXFLAGS = -Wall -W -g -MP -MD -pipe -Werror $(COMPILER_FPIC)
-+AM_CXXFLAGS = -Wall -W -g -MP -MD -pipe $(COMPILER_FPIC)
-
- noinst_LIBRARIES = libfw_comps_mgr.a
-
-diff -ur mstflint-4.10.0/libmfa/Makefile.am mstflint-4.10.0-gcc11/libmfa/Makefile.am
---- mstflint-4.10.0/libmfa/Makefile.am 2018-08-28 15:47:47.000000000 +0200
-+++ mstflint-4.10.0-gcc11/libmfa/Makefile.am 2021-10-05 22:29:47.516870358 +0200
-@@ -35,7 +35,7 @@
- #INCLUDES = -I. -I$(USER_DIR)/ext_libs/libtar -I$(USER_DIR)/ext_libs/libtar/listhash -I$(USER_DIR)/ext_libs/minixz
- INCLUDES = -I. -I$(USER_DIR)/ext_libs/minixz -I$(USER_DIR)/common
-
--AM_CFLAGS = -MD -pipe -Wall -W -g -Werror $(COMPILER_FPIC)
-+AM_CFLAGS = -MD -pipe -Wall -W -g $(COMPILER_FPIC)
-
- noinst_LTLIBRARIES = libmfa.a
- libmfa_a_LIBADD = -L$(USER_DIR)/ext_libs/minixz -lminixz
-diff -ur mstflint-4.10.0/mad_ifc/Makefile.am mstflint-4.10.0-gcc11/mad_ifc/Makefile.am
---- mstflint-4.10.0/mad_ifc/Makefile.am 2018-08-28 15:47:47.000000000 +0200
-+++ mstflint-4.10.0-gcc11/mad_ifc/Makefile.am 2021-10-05 22:29:47.516870358 +0200
-@@ -37,7 +37,7 @@
-
- INCLUDES = -I. -I.. -I$(MTCR_INC_DIR) -I../${MTCR_CONF_DIR} -I$(USER_DIR)/tools_ayouts/
-
--AM_CFLAGS = -W -Wall -Werror -g -MP -MD $(COMPILER_FPIC)
-+AM_CFLAGS = -W -Wall -g -MP -MD $(COMPILER_FPIC)
-
-
- noinst_LIBRARIES = libmad_ifc.a
-diff -ur mstflint-4.10.0/mft_utils/Makefile.am mstflint-4.10.0-gcc11/mft_utils/Makefile.am
---- mstflint-4.10.0/mft_utils/Makefile.am 2018-08-28 15:47:48.000000000 +0200
-+++ mstflint-4.10.0-gcc11/mft_utils/Makefile.am 2021-10-05 22:29:47.516870358 +0200
-@@ -34,7 +34,7 @@
- USER_DIR = $(top_srcdir)
- AM_CPPFLAGS = -I. -I$(USER_DIR)/common $(COMPILER_FPIC)
-
--AM_CFLAGS = -MD -pipe -Wall -W -Werror $(COMPILER_FPIC)
-+AM_CFLAGS = -MD -pipe -Wall -W $(COMPILER_FPIC)
-
- noinst_HEADERS = mft_sig_handler.h errmsg.h
-
-diff -ur mstflint-4.10.0/mlxfwupdate/Makefile.am mstflint-4.10.0-gcc11/mlxfwupdate/Makefile.am
---- mstflint-4.10.0/mlxfwupdate/Makefile.am 2018-08-28 15:47:49.000000000 +0200
-+++ mstflint-4.10.0-gcc11/mlxfwupdate/Makefile.am 2021-10-05 22:29:47.516870358 +0200
-@@ -63,7 +63,7 @@
- -I$(USER_DIR)/mft_utils\
- -I$(USER_DIR)/dev_mgt
-
--AM_CXXFLAGS = -g -MP -MD -Wall -W -Werror $(BOOST_CXX_IGNORES)
-+AM_CXXFLAGS = -g -MP -MD -Wall -W $(BOOST_CXX_IGNORES)
-
-
- common_SOURCEES = mlxfwmanager_common.cpp mlxfwmanager_common.h\
-diff -ur mstflint-4.10.0/mlxsign_lib/Makefile.am mstflint-4.10.0-gcc11/mlxsign_lib/Makefile.am
---- mstflint-4.10.0/mlxsign_lib/Makefile.am 2018-08-28 15:47:49.000000000 +0200
-+++ mstflint-4.10.0-gcc11/mlxsign_lib/Makefile.am 2021-10-05 22:29:47.516870358 +0200
-@@ -33,7 +33,7 @@
- # Makefile.am -- Process this file with automake to produce Makefile.in
- USER_DIR = ..
- INCLUDES = -I$(USER_DIR) -I$(USER_DIR)/common
--AM_CFLAGS = -Wall -W -Werror -g -MP -MD -pipe $(COMPILER_FPIC)
-+AM_CFLAGS = -Wall -W -g -MP -MD -pipe $(COMPILER_FPIC)
- AM_CFLAGS += -DTOOLS_CRYPTO_KEY='$(TOOLS_CRYPTO_KEY)' -DTOOLS_CRYPTO_IV='$(TOOLS_CRYPTO_IV)'
-
- noinst_LIBRARIES = libmlxsign.a
-diff -ur mstflint-4.10.0/mvpd/Makefile.am mstflint-4.10.0-gcc11/mvpd/Makefile.am
---- mstflint-4.10.0/mvpd/Makefile.am 2018-08-28 15:47:50.000000000 +0200
-+++ mstflint-4.10.0-gcc11/mvpd/Makefile.am 2021-10-05 22:29:47.520203656 +0200
-@@ -37,7 +37,7 @@
- USER_DIR = $(top_srcdir)
-
- AM_CPPFLAGS = -I. -I$(USER_DIR) -I$(srcdir) -I$(LAYOUTS_DIR) -I$(USER_DIR)/include/mtcr_ul
--AM_CFLAGS = -W -Wall -Werror -g -MP -MD $(COMPILER_FPIC)
-+AM_CFLAGS = -W -Wall -g -MP -MD $(COMPILER_FPIC)
-
- noinst_LTLIBRARIES = libmvpd.a
-
-diff -ur mstflint-4.10.0/reg_access/Makefile.am mstflint-4.10.0-gcc11/reg_access/Makefile.am
---- mstflint-4.10.0/reg_access/Makefile.am 2018-08-28 15:47:50.000000000 +0200
-+++ mstflint-4.10.0-gcc11/reg_access/Makefile.am 2021-10-05 22:29:47.520203656 +0200
-@@ -38,7 +38,7 @@
-
- AM_CPPFLAGS = -I. -I$(USER_DIR) -I$(srcdir) -I$(LAYOUTS_DIR) -I$(USER_DIR)/include/mtcr_ul
-
--AM_CFLAGS = -W -Wall -Werror -g -MP -MD $(COMPILER_FPIC)
-+AM_CFLAGS = -W -Wall -g -MP -MD $(COMPILER_FPIC)
-
- noinst_LTLIBRARIES = libreg_access.a
-
-diff -ur mstflint-4.10.0/tools_res_mgmt/Makefile.am mstflint-4.10.0-gcc11/tools_res_mgmt/Makefile.am
---- mstflint-4.10.0/tools_res_mgmt/Makefile.am 2018-08-28 15:47:51.000000000 +0200
-+++ mstflint-4.10.0-gcc11/tools_res_mgmt/Makefile.am 2021-10-05 22:29:47.520203656 +0200
-@@ -35,7 +35,7 @@
- MTCR_DIR = $(USER_DIR)/include/mtcr_ul
- AM_CPPFLAGS = -I. -I../common -I$(MTCR_DIR) -I.. -I$(USER_DIR)/${MTCR_CONF_DIR}
-
--AM_CFLAGS = -W -Wall -Werror -g -MP -MD $(COMPILER_FPIC)
-+AM_CFLAGS = -W -Wall -g -MP -MD $(COMPILER_FPIC)
- noinst_LIBRARIES = libtools_res_mgmt.a
-
- libtools_res_mgmt_a_SOURCES = tools_res_mgmt.c tools_time.c
-diff -ur mstflint-4.10.0/xz_utils/Makefile.am mstflint-4.10.0-gcc11/xz_utils/Makefile.am
---- mstflint-4.10.0/xz_utils/Makefile.am 2018-08-28 15:47:51.000000000 +0200
-+++ mstflint-4.10.0-gcc11/xz_utils/Makefile.am 2021-10-05 22:29:47.520203656 +0200
-@@ -35,7 +35,7 @@
- USER_DIR = ..
- MTCR_DIR = $(USER_DIR)/${MTCR_CONF_DIR}
- INCLUDES = -I. -I$(USER_DIR) -I$(MTCR_DIR) -I$(USER_DIR)/common
--AM_CFLAGS = -W -g -MP -MD ${COMPILER_FPIC} -Werror
-+AM_CFLAGS = -W -g -MP -MD ${COMPILER_FPIC}
- noinst_LTLIBRARIES = libxz_utils.a
- libxz_utils_a_SOURCES = xz_utils.c xz_utils.h
-
diff --git a/openssl-1.1.patch b/openssl-1.1.patch
deleted file mode 100644
index 1a762f8..0000000
--- a/openssl-1.1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mstflint-4.10.0-3/mlxsign_lib/mlxsign_lib.cpp.orig 2018-08-28 15:36:51.000000000 +0200
-+++ mstflint-4.10.0-3/mlxsign_lib/mlxsign_lib.cpp 2018-10-31 21:24:51.980647273 +0100
-@@ -360,8 +360,7 @@
-
- MlxSignHMAC::MlxSignHMAC()
- {
-- ctx = malloc(sizeof(HMAC_CTX));
-- HMAC_CTX_init((HMAC_CTX*)ctx);
-+ ctx = HMAC_CTX_new();
- }
-
- int MlxSignHMAC::setKey(const std::vector<u_int8_t>& key)
-@@ -415,8 +414,7 @@
-
- MlxSignHMAC::~MlxSignHMAC()
- {
-- HMAC_CTX_cleanup((HMAC_CTX*)ctx);
-- free(ctx);
-+ HMAC_CTX_free((HMAC_CTX*)ctx);
- }
-
- #endif //ENABLE_OPENSSL
diff --git a/x32.patch b/x32.patch
index 21c2af7..b30a1f9 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,31 +1,31 @@
---- mstflint-4.10.0/tools_layouts/adb_to_c_utils.h~ 2018-08-28 15:47:51.000000000 +0200
-+++ mstflint-4.10.0/tools_layouts/adb_to_c_utils.h 2018-10-31 21:54:40.265218982 +0100
-@@ -169,7 +169,7 @@
- #define U16H_FMT "0x%04x"
- #define U8H_FMT "0x%02x"
+--- mstflint-4.31.0/tools_layouts/adb_to_c_utils.h.orig 2025-02-02 14:05:06.000000000 +0100
++++ mstflint-4.31.0/tools_layouts/adb_to_c_utils.h 2025-04-20 21:41:25.600451578 +0200
+@@ -181,7 +181,7 @@ extern "C"
+ #define U16H_FMT "0x%04x"
+ #define U8H_FMT "0x%02x"
--#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l)
-+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || (defined(ARCH_x86_64) && defined(__ILP32__))
- # if defined(__MINGW32__) || defined(__MINGW64__)
- # include <inttypes.h>
- # define U64D_FMT "0x%" PRId64
---- mstflint-4.10.0/common/compatibility.h~ 2018-08-28 15:47:44.000000000 +0200
-+++ mstflint-4.10.0/common/compatibility.h 2018-10-31 21:56:56.203556144 +0100
-@@ -40,7 +40,7 @@
+-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_m68k) || defined(ARCH_hppa)
++#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_m68k) || defined(ARCH_hppa) || (defined(ARCH_x86_64) && defined(__ILP32__))
+ #if defined(__MINGW32__) || defined(__MINGW64__)
+ #include <inttypes.h>
+ #define U64D_FMT "0x%" PRId64
+--- mstflint-4.31.0/common/compatibility.h.orig 2025-02-02 14:05:06.000000000 +0100
++++ mstflint-4.31.0/common/compatibility.h 2025-04-20 21:45:17.029197820 +0200
+@@ -41,7 +41,7 @@
#include <stdio.h>
--#if defined(__ia64__) || defined(__x86_64__) || defined(__PPC64__) || defined(__arm__)
-+#if defined(__ia64__) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(__PPC64__) || defined(__arm__)
- #define U64L "l"
+-#if defined(__ia64__) || defined(__x86_64__) || defined(__PPC64__) || defined(__arm__) || defined(__e2k__)
++#if defined(__ia64__) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(__PPC64__) || defined(__arm__) || defined(__e2k__)
+ #define U64L "l"
#else
- #define U64L "ll"
-@@ -94,7 +94,7 @@
- #define U16H_FMT "0x%04x"
- #define U8H_FMT "0x%02x"
+ #define U64L "ll"
+@@ -104,7 +104,7 @@
+ #define U16H_FMT "0x%04x"
+ #define U8H_FMT "0x%02x"
--#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l)
-+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || (defined(ARCH_x86_64) && defined(__ILP32__))
- # if defined(__MINGW32__) || defined(__MINGW64__)
- # include <inttypes.h>
- # define U64D_FMT "0x%" PRId64
+-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_m68k) || \
++#if defined(ARCH_x86) || (defined(ARCH_x86_64) && defined(__ILP32__)) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_m68k) || \
+ defined(ARCH_hppa)
+ #if defined(__MINGW32__) || defined(__MINGW64__)
+ #include <inttypes.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mstflint.git/commitdiff/8b723689638c5104357fe4905d131f561a58ecbd
More information about the pld-cvs-commit
mailing list