From nobody Sat Dec 17 00:22:07 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NYmr00CSLzt82y; Sat, 17 Dec 2022 00:22:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NYmqz6L6Xz4M4C; Sat, 17 Dec 2022 00:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671236527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FeD2xnQH+rTkTcxSeyzWmkitvbb6xI5a44B6kcyCj6A=; b=qmMsSUHvFqjVVDf9Cb77t77OVwTVXhvlY8QOZ2Xt5kEO++yCVfmKyIQ8UnKG1XFjW3myRh vJMMpornzo9fXaql+T+oi9mxg7FPWvQGweh/I7Jf2kw5NQEBqwfYkQiuRCvAJ1UQfsr4ZF +9ZZNYugS8ZlotiJbZTQWEamB54Ssr1KMnqAIqbfzq9WFuN8+VVDSudYBiEzL5U/Afr5NO +eCNnATwbeDRljFkjfZ4Gwa9Hn9O1kmc7jYLwBstHm8XTA3QBxJWTcAt4ffDtMGfLWlx5S d57o31FQ7YxHhcwmf4o06rOdg77PDbNS+qIOBYObkyuT4O3MnDPml5e+tp+8cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671236527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FeD2xnQH+rTkTcxSeyzWmkitvbb6xI5a44B6kcyCj6A=; b=RIBCLcBrR+5+RDXWJ9Rrsj78LfoXdgAT5teQxvk2Z7tiB5VFXMlPzGXM6r+sShhMm90a17 BRY7KO9QKNXFGjF1ZCFfbUkIjJtlVc+OXpctbxeR7oXGegNZdXnAw5uyY7ueWCnwSBwLVx ysGcSHDt24NTk9d2caRMJthMtoX9E9n4tszjsajyRCXo4LxTqX/NqwcbKwXZShQh5J1xGt dT+VZRMrnaUVSaTCuki3aKbcxTT5X1ia9p1rN4Oi66qjitnKmag4dHKraurWYojbGiuR+R GRSFoQKgkncb8Q1Q3Naio5qkmNNLQXd1e/XtAxCLDq96U05n+simcK3nPt2xjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671236527; a=rsa-sha256; cv=none; b=TQyaMpuwgFU8Wz14WKshNgLyjJp6F/hDDmuxXPJjtR+jmzLjFWU+gQ0sfmJHhSItx23E8Y nmtl9S/4iGRiuPIoUaif5y9ZOCBG3O2zTmwC5kjjBtPqR2OZSdVdIHRrbdJQg7t9Lsudyt FdRcugyjnA9Ve2PoQe26CZZfLGnwSXnl0zLAm09GiZFN+Dj5MYCrz3+fmKXSRFAEURfJZX iJQhz49AfSnTx1RrAzVxyIJmkz78G3gak7EV71vdM/q+9PxFMpeVbEhTXOr4gjlx1vfEQL ClH3UGRtSSdFDRpObz/aipOANLztXDx4ywzencMqFcmuT5DZaaRwD7Wx+yJ4jA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NYmqz5QGdzXTj; Sat, 17 Dec 2022 00:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BH0M7EW054751; Sat, 17 Dec 2022 00:22:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BH0M7BA054750; Sat, 17 Dec 2022 00:22:07 GMT (envelope-from git) Date: Sat, 17 Dec 2022 00:22:07 GMT Message-Id: <202212170022.2BH0M7BA054750@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: d1f2880461a4 - main - sysutils/mstflint: Update to 4.22.0-1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1f2880461a4927c9b1ca822127afb237669aa7b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1f2880461a4927c9b1ca822127afb237669aa7b commit d1f2880461a4927c9b1ca822127afb237669aa7b Author: Olivier Cochard AuthorDate: 2022-12-17 00:16:48 +0000 Commit: Olivier Cochard CommitDate: 2022-12-17 00:21:12 +0000 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 --- sysutils/mstflint/Makefile | 10 +++++++--- sysutils/mstflint/distinfo | 6 +++--- .../files/extrat-LITE-patch-mlxconfig_Makefile.am | 8 ++++---- .../files/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp | 19 +++++++++---------- .../files/extrat-patch-mlxfwupdate_server_request.cpp | 18 +++++++++--------- sysutils/mstflint/files/patch-configure.ac | 6 +++--- .../files/patch-mlxfwupdate_cmd__line__params.cpp | 10 +++++----- sysutils/mstflint/pkg-descr | 2 -- sysutils/mstflint/pkg-plist | 14 ++++++++++++++ 9 files changed, 54 insertions(+), 39 deletions(-) diff --git a/sysutils/mstflint/Makefile b/sysutils/mstflint/Makefile index 51f7cc3e28cb..9fd6dcab207e 100644 --- a/sysutils/mstflint/Makefile +++ b/sysutils/mstflint/Makefile @@ -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 +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 diff --git a/sysutils/mstflint/distinfo b/sysutils/mstflint/distinfo index be15415a6bc3..5a704ce65ea4 100644 --- a/sysutils/mstflint/distinfo +++ b/sysutils/mstflint/distinfo @@ -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 diff --git a/sysutils/mstflint/files/extrat-LITE-patch-mlxconfig_Makefile.am b/sysutils/mstflint/files/extrat-LITE-patch-mlxconfig_Makefile.am index 08abbc2bceac..bd94fd521d74 100644 --- a/sysutils/mstflint/files/extrat-LITE-patch-mlxconfig_Makefile.am +++ b/sysutils/mstflint/files/extrat-LITE-patch-mlxconfig_Makefile.am @@ -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 diff --git a/sysutils/mstflint/files/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp b/sysutils/mstflint/files/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp index 858e33e7bdc3..7540c09ee44a 100644 --- a/sysutils/mstflint/files/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp +++ b/sysutils/mstflint/files/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp @@ -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 @@ -10,19 +10,18 @@ #include "mlxarchive_mfa2.h" #include "mlxarchive_mfa2_utils.h" -@@ -120,6 +122,7 @@ void MFA2::pack(vector& 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 descriptorsBuff; packDescriptors(descriptorsBuff); -@@ -136,7 +139,7 @@ void MFA2::pack(vector& buff) +@@ -131,6 +134,7 @@ mlxSignSHA256 << zippedComponentBlockBuff; mlxSignSHA256.getDigest(digest); _packageDescriptor.setSHA256(digest); -- +#endif } diff --git a/sysutils/mstflint/files/extrat-patch-mlxfwupdate_server_request.cpp b/sysutils/mstflint/files/extrat-patch-mlxfwupdate_server_request.cpp index 9b272356c8e0..6d8fda101e5a 100644 --- a/sysutils/mstflint/files/extrat-patch-mlxfwupdate_server_request.cpp +++ b/sysutils/mstflint/files/extrat-patch-mlxfwupdate_server_request.cpp @@ -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 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; + _ceritifcate = certificate; _numberOfRetrials = numberOfRetrials; +#ifdef USE_CURL - _headers = NULL; + _headers = NULL; +#endif - if (proxy != NULL) { - if (proxy[0] != 0) { - _UseProxy = 1; + if (proxy != NULL) + { + if (proxy[0] != 0) diff --git a/sysutils/mstflint/files/patch-configure.ac b/sysutils/mstflint/files/patch-configure.ac index cadb5d44529c..d00ebfb529b3 100644 --- a/sysutils/mstflint/files/patch-configure.ac +++ b/sysutils/mstflint/files/patch-configure.ac @@ -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" ], [ diff --git a/sysutils/mstflint/files/patch-mlxfwupdate_cmd__line__params.cpp b/sysutils/mstflint/files/patch-mlxfwupdate_cmd__line__params.cpp index 863628c9fbaa..527e6676864e 100644 --- a/sysutils/mstflint/files/patch-mlxfwupdate_cmd__line__params.cpp +++ b/sysutils/mstflint/files/patch-mlxfwupdate_cmd__line__params.cpp @@ -1,14 +1,14 @@ ---- 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 + #ifdef MSTFLINT - certificate = (string)ROOT_PATH + "etc/mstflint/ca-bundle.crt"; + certificate = (string)ROOT_PATH + "/etc/ssl/cert.pem"; - #else + #else - certificate = (string)ROOT_PATH + "etc/mft/ca-bundle.crt"; + certificate = (string)ROOT_PATH + "/etc/ssl/cert.pem"; - #endif + #endif #endif } diff --git a/sysutils/mstflint/pkg-descr b/sysutils/mstflint/pkg-descr index db630d101a2b..b6a2d8f1f6fb 100644 --- a/sysutils/mstflint/pkg-descr +++ b/sysutils/mstflint/pkg-descr @@ -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 diff --git a/sysutils/mstflint/pkg-plist b/sysutils/mstflint/pkg-plist index 2da01124f7a1..e936dad68b03 100644 --- a/sysutils/mstflint/pkg-plist +++ b/sysutils/mstflint/pkg-plist @@ -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