1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00

sysutils/mstflint: Update to 4.22.0-1

ChangeLog:	https://github.com/Mellanox/mstflint/releases/tag/v4.22.0-1

Reported by:	hselasky
Sponsored by:	Netflix
This commit is contained in:
Olivier Cochard 2022-12-17 01:16:48 +01:00
parent 70b881cb57
commit d1f2880461
9 changed files with 54 additions and 39 deletions

View File

@ -1,11 +1,11 @@
PORTNAME= mstflint
DISTVERSIONPREFIX= v
DISTVERSION= 4.18.0-1
DISTVERSION= 4.22.0-1
CATEGORIES= sysutils
MAINTAINER= hselasky@FreeBSD.org
COMMENT?= Firmware Burning and Diagnostics Tools for Mellanox devices
WWW= https://www.mellanox.com/page/management_tools
WWW= https://github.com/Mellanox/mstflint
LICENSE= BSD2CLAUSE GPLv2
LICENSE_COMB= dual
@ -37,6 +37,10 @@ GH_ACCOUNT= Mellanox
.include <bsd.port.options.mk>
pre-patch:
@${ECHO} '#define TOOLS_GIT_SHA "N/A"' > ${WRKSRC}/common/gitversion.h
@${MKDIR} ${WRKSRC}/config
.if ${PORT_OPTIONS:MSTATIC}
.else
USES+= ssl
@ -45,7 +49,7 @@ USES+= ssl
.if ${PORT_OPTIONS:MADAB}
CONFIGURE_ARGS+= --enable-adb-generic-tools
.if ${PORT_OPTIONS:MSTATIC}
BROKEN= does not link: expat2 no longer provides static library
BROKEN= does not link: expat2 no longer provides static library by default
BUILD_DEPENDS+= xmlwf:textproc/expat2 \
boost-libs>0:devel/boost-libs
.else

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1645451826
SHA256 (Mellanox-mstflint-v4.18.0-1_GH0.tar.gz) = ebc916c1d69b83f7f6481ad9a122ae28e76542026f9bd4cda32311d9f692644d
SIZE (Mellanox-mstflint-v4.18.0-1_GH0.tar.gz) = 4877851
TIMESTAMP = 1671207291
SHA256 (Mellanox-mstflint-v4.22.0-1_GH0.tar.gz) = 1403928463fe589034e0effb215bbeb18e0ffac745c197b4511782f6694fe24c
SIZE (Mellanox-mstflint-v4.22.0-1_GH0.tar.gz) = 5936816

View File

@ -1,6 +1,6 @@
--- mlxconfig/Makefile.am.orig 2020-01-10 20:19:15.456616000 +0100
+++ mlxconfig/Makefile.am 2020-01-10 20:19:48.307817000 +0100
@@ -55,13 +55,6 @@ AM_CPPFLAGS = -I. -I$(USER_DIR) -I$(top_srcdir)/includ
--- mlxconfig/Makefile.am.orig 2022-12-16 18:41:14.183823000 +0100
+++ mlxconfig/Makefile.am 2022-12-16 18:41:40.798788000 +0100
@@ -55,13 +55,6 @@
AM_CXXFLAGS = -pthread -Wall -W -g -MP -MD -pipe -Wno-deprecated-declarations $(COMPILER_FPIC) -DDATA_PATH=\"$(pkgdatadir)\"
bin_PROGRAMS = mstconfig
@ -10,7 +10,7 @@
- cp $(PYTHON_WRAPPER_SCRIPT) $@
-
-mlxprivhostlibdir=$(libdir)/mstflint/python_tools/$(MLXPRIVHOST_PYTHON_WRAPPER)
-mlxprivhostlib_SCRIPTS = $(MLXPRIVHOST_PYTHON_WRAPPER).py
-mlxprivhostlib_DATA = $(MLXPRIVHOST_PYTHON_WRAPPER).py
noinst_LTLIBRARIES = libmlxcfg.a

View File

@ -1,6 +1,6 @@
--- mlxarchive/mlxarchive_mfa2.cpp.orig 2020-01-05 16:50:06.000000000 +0100
+++ mlxarchive/mlxarchive_mfa2.cpp 2020-01-09 14:20:54.186228000 +0100
@@ -39,7 +39,9 @@
--- mlxarchive/mlxarchive_mfa2.cpp.orig 2022-12-16 18:15:27.440142000 +0100
+++ mlxarchive/mlxarchive_mfa2.cpp 2022-12-16 18:16:25.933770000 +0100
@@ -40,7 +40,9 @@
*/
#include <xz_utils/xz_utils.h>
@ -10,19 +10,18 @@
#include "mlxarchive_mfa2.h"
#include "mlxarchive_mfa2_utils.h"
@@ -120,6 +122,7 @@ void MFA2::pack(vector<u_int8_t>& buff)
xz_compress_crc32(9, componentsBlockBuff.data(), componentsBlockBuff.size(),
zippedComponentBlockBuff.data(), zippedSize);
@@ -115,6 +117,7 @@
printf("-E- zipped size not as expected\n");
exit(1);
}
+#ifndef NO_OPEN_SSL
//compute descriptors SHA256
// compute descriptors SHA256
vector<u_int8_t> descriptorsBuff;
packDescriptors(descriptorsBuff);
@@ -136,7 +139,7 @@ void MFA2::pack(vector<u_int8_t>& buff)
@@ -131,6 +134,7 @@
mlxSignSHA256 << zippedComponentBlockBuff;
mlxSignSHA256.getDigest(digest);
_packageDescriptor.setSHA256(digest);
-
+#endif
}

View File

@ -1,7 +1,7 @@
--- mlxfwupdate/server_request.cpp.orig 2020-01-09 00:45:10.200149000 +0100
+++ mlxfwupdate/server_request.cpp 2020-01-09 00:46:56.459627000 +0100
--- mlxfwupdate/server_request.cpp.orig 2022-12-16 18:34:53.974210000 +0100
+++ mlxfwupdate/server_request.cpp 2022-12-16 18:36:46.969103000 +0100
@@ -43,9 +43,7 @@
#include <string>
using namespace std;
-#ifndef USE_CURL
@ -11,13 +11,13 @@
extern int abort_request;
@@ -62,7 +60,9 @@ ServerRequest::ServerRequest(const char *url, const ch
@@ -65,7 +63,9 @@
_show_progress = show_progress;
_ceritifcate = certificate;
_numberOfRetrials = numberOfRetrials;
+#ifdef USE_CURL
_headers = NULL;
+#endif
if (proxy != NULL) {
if (proxy[0] != 0) {
_UseProxy = 1;
if (proxy != NULL)
{
if (proxy[0] != 0)

View File

@ -1,6 +1,6 @@
--- configure.ac.orig 2020-10-02 01:05:50.612135000 +0200
+++ configure.ac 2020-10-02 01:06:26.890856000 +0200
@@ -233,7 +233,7 @@
--- configure.ac.orig 2022-10-31 08:38:13 UTC
+++ configure.ac
@@ -248,7 +248,7 @@ AS_IF([test "x$enable_static_libstdcpp" = "xyes" -o "x
AS_HELP_STRING([--enable-static-libstdcpp], [Enable link static to libstdc++]))
AS_IF([test "x$enable_static_libstdcpp" = "xyes" -o "x$enable_all_static" = "xyes" ], [

View File

@ -1,6 +1,6 @@
--- mlxfwupdate/cmd_line_params.cpp.orig 2019-11-16 07:49:07 UTC
--- mlxfwupdate/cmd_line_params.cpp.orig 2022-12-16 14:59:44 UTC
+++ mlxfwupdate/cmd_line_params.cpp
@@ -97,9 +97,9 @@ CmdLineParams::CmdLineParams()
@@ -92,9 +92,9 @@ CmdLineParams::CmdLineParams()
#else
#ifdef MSTFLINT

View File

@ -10,5 +10,3 @@ code.
This package is based on a subset of the Mellanox Firmware Tools (MFT) package.
For a full documentation of the MFT package, please refer to the downloads page
in Mellanox web site.
See also: https://github.com/Mellanox/mstflint

View File

@ -138,9 +138,19 @@ man/man1/mstreg.1.gz
man/man1/mstregdump.1.gz
man/man1/mstresourcedump.1.gz
man/man1/mstvpd.1.gz
%%DATADIR%%/AbirGearBox.csv
%%DATADIR%%/AmosGearBox.csv
%%DATADIR%%/AmosGearBoxManager.csv
%%DATADIR%%/BlueField.csv
%%DATADIR%%/BlueField2.csv
%%DATADIR%%/BlueField3.csv
%%DATADIR%%/Cable.csv
%%DATADIR%%/CableQSFP.csv
%%DATADIR%%/CableQSFPaging.csv
%%DATADIR%%/CableSFP.csv
%%DATADIR%%/CableSFP51.csv
%%DATADIR%%/CableSFP51Paging.csv
%%DATADIR%%/ConnectX8.csv
%%DATADIR%%/ConnectIB.csv
%%DATADIR%%/ConnectX2.csv
%%DATADIR%%/ConnectX3.csv
@ -152,11 +162,15 @@ man/man1/mstvpd.1.gz
%%DATADIR%%/ConnectX6DX.csv
%%DATADIR%%/ConnectX6LX.csv
%%DATADIR%%/ConnectX7.csv
%%DATADIR%%/GB100.csv
%%DATADIR%%/Quantum2.csv
%%DATADIR%%/Quantum3.csv
%%DATADIR%%/InfiniScaleIV.csv
%%DATADIR%%/Quantum.csv
%%DATADIR%%/Spectrum.csv
%%DATADIR%%/Spectrum2.csv
%%DATADIR%%/Spectrum3.csv
%%DATADIR%%/Spectrum4.csv
%%DATADIR%%/SwitchIB.csv
%%DATADIR%%/SwitchIB2.csv
%%DATADIR%%/SwitchX.csv