diff --git a/sysutils/mstflint/Makefile b/sysutils/mstflint/Makefile index 10af903636e2..45e1f0ab92d5 100644 --- a/sysutils/mstflint/Makefile +++ b/sysutils/mstflint/Makefile @@ -1,105 +1,105 @@ PORTNAME= mstflint DISTVERSIONPREFIX= v -DISTVERSION= 4.16.0-1 +DISTVERSION= 4.18.0-1 CATEGORIES= sysutils MAINTAINER= hselasky@FreeBSD.org COMMENT?= Firmware Burning and Diagnostics Tools for Mellanox devices LICENSE= BSD2CLAUSE GPLv2 LICENSE_COMB= dual LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE USES= autoreconf libtool gmake pkgconfig OPTIONS_DEFINE= FWMANAGER ADAB STATIC OPTIONS_SUB= yes .if defined(LITE) OPTIONS_SLAVE= FWMANAGER ADAB STATIC .endif FWMANAGER_DESC= Build with mstfwmanager and mstarchive ADAB_DESC= Build with mstreg and mstlink STATIC_DESC= Static binary (disable curl support) STATIC_CONFIGURE_ON= --enable-all-static --disable-dc \ --disable-openssl --disable-inband LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes USE_GITHUB= yes GH_ACCOUNT= Mellanox .include .if ${PORT_OPTIONS:MSTATIC} .else USES+= ssl .endif .if ${PORT_OPTIONS:MADAB} CONFIGURE_ARGS+= --enable-adb-generic-tools .if ${PORT_OPTIONS:MSTATIC} BROKEN= does not link: expat2 no longer provides static library BUILD_DEPENDS+= xmlwf:textproc/expat2 \ boost-libs>0:devel/boost-libs .else LIB_DEPENDS+= libexpat.so:textproc/expat2 \ libboost_regex.so:devel/boost-libs .endif .endif .if ${PORT_OPTIONS:MFWMANAGER} CONFIGURE_ARGS+= --enable-fw-mgr .if ${PORT_OPTIONS:MSTATIC} BUILD_DEPENDS+= xmllint:textproc/libxml2 \ ${LOCALBASE}/include/boost/algorithm/string/detail/formatter_regex.hpp:devel/boost-libs EXTRA_PATCHES+= ${PATCHDIR}/extrat-patch-configure.ac \ ${PATCHDIR}/extrat-patch-mlxarchive_Makefile.am \ ${PATCHDIR}/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp \ ${PATCHDIR}/extrat-patch-mlxfwupdate_Makefile.am \ ${PATCHDIR}/extrat-patch-mlxfwupdate_server_request.cpp .else LIB_DEPENDS+= libxml2.so:textproc/libxml2 \ libboost_regex.so:devel/boost-libs \ libcurl.so:ftp/curl RUN_DEPENDS+= ca_root_nss>=0:security/ca_root_nss .endif .endif .if defined(LITE) LDFLAGS+= -lmd EXTRA_PATCHES+= ${PATCHDIR}/extrat-LITE-patch-Makefile.am \ ${PATCHDIR}/extrat-LITE-patch-mlxconfig_Makefile.am \ ${PATCHDIR}/extrat-LITE-patch-mlxreg_Makefile.am \ ${PATCHDIR}/extrat-LITE-patch-cmdif_Makefile.am \ ${PATCHDIR}/extrat-LITE-patch-mtcr_freebsd_Makefile.am \ ${PATCHDIR}/extrat-LITE-patch-tools_layouts_Makefile.am \ ${PATCHDIR}/extrat-LITE-patch-common_Makefile.am \ ${PATCHDIR}/extrat-LITE-patch-dev_mgt_Makefile.am \ ${PATCHDIR}/extrat-LITE-patch-reg_access_Makefile.am post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/libadb_parser.a \ ${STAGEDIR}${PREFIX}/lib/libcmdif.a \ ${STAGEDIR}${PREFIX}/lib/libdev_mgt.a \ ${STAGEDIR}${PREFIX}/lib/libmodules_lib.a \ ${STAGEDIR}${PREFIX}/lib/libmstreg_lib.a \ ${STAGEDIR}${PREFIX}/lib/libprint_util_lib.a \ ${STAGEDIR}${PREFIX}/lib/libreg_access.a \ ${STAGEDIR}${PREFIX}/lib/libtools_layouts.a \ ${STAGEDIR}${PREFIX}/lib/libmstarchive.a \ ${STAGEDIR}${PREFIX}/lib/mstflint/libmtcr_ul.a \ ${STAGEDIR}${PREFIX}/bin/mstarchive ${RMDIR} ${STAGEDIR}${PREFIX}/lib/mstflint .else post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/rreg_access.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/ccmdif.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/cmtcr.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mstflint/python_tools/c_dev_mgt.so .endif .include diff --git a/sysutils/mstflint/distinfo b/sysutils/mstflint/distinfo index 939ff5866c34..be15415a6bc3 100644 --- a/sysutils/mstflint/distinfo +++ b/sysutils/mstflint/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612194320 -SHA256 (Mellanox-mstflint-v4.16.0-1_GH0.tar.gz) = c6aaaa3bf58c6c6258cdb663cdc57164e99611d3d81e391508efb0df34723492 -SIZE (Mellanox-mstflint-v4.16.0-1_GH0.tar.gz) = 4528649 +TIMESTAMP = 1645451826 +SHA256 (Mellanox-mstflint-v4.18.0-1_GH0.tar.gz) = ebc916c1d69b83f7f6481ad9a122ae28e76542026f9bd4cda32311d9f692644d +SIZE (Mellanox-mstflint-v4.18.0-1_GH0.tar.gz) = 4877851 diff --git a/sysutils/mstflint/files/extrat-patch-configure.ac b/sysutils/mstflint/files/extrat-patch-configure.ac index e137935eaf62..c7c70df677ab 100644 --- a/sysutils/mstflint/files/extrat-patch-configure.ac +++ b/sysutils/mstflint/files/extrat-patch-configure.ac @@ -1,36 +1,36 @@ ---- configure.ac.orig 2020-01-05 16:50:06.000000000 +0100 -+++ configure.ac 2020-01-09 00:15:46.179518000 +0100 -@@ -104,12 +104,10 @@ AC_ARG_ENABLE(fw-mgr, +--- configure.ac.orig 2022-02-21 15:07:33.000000000 +0100 ++++ configure.ac 2022-02-21 15:08:50.061537000 +0100 +@@ -114,12 +114,10 @@ AC_ARG_ENABLE(fw-mgr, [enable_fw_mgr="no"]) AC_MSG_RESULT($enable_fw_mgr) if test "x$enable_fw_mgr" = "xyes"; then - AC_CHECK_HEADER(curl/curl.h,,AC_MSG_ERROR([cannot find curl/curl.h . this header is needed for compiling fw manager tool])) AC_CHECK_HEADER(zlib.h,,AC_MSG_ERROR([cannot find zlib.h . this header is needed for compiling fw manager tool])) AC_CHECK_LIB(z, uncompress,, AC_MSG_ERROR([cannot find zlib uncompress() function.])) AC_CHECK_HEADER(lzma.h,,AC_MSG_ERROR([Cannot find lzma.h.])) AC_CHECK_LIB(boost_regex, regcompA,, AC_MSG_ERROR([cannot find boost_regex regcompA() function. Try re-installing the library...])) - CURL_INC_DIR=/usr/include/curl/ fi # Adabe -@@ -133,8 +131,6 @@ if test "x$enable_adb_generic_tools" = "xyes"; then +@@ -143,8 +141,6 @@ if test "x$enable_adb_generic_tools" = "xyes"; then AC_LANG_POP([C++]) fi -AC_SUBST(CURL_INC_DIR) - AM_CONDITIONAL(ENABLE_FWMGR, [test "x$enable_fw_mgr" = "xyes" ]) AC_SUBST(ENABLE_FWMGR) -@@ -352,11 +348,6 @@ AS_IF([test "x$enable_cs" = "xyes" || test "x$enable_o - AS_IF([test "x$enable_openssl" = "xyes"], [ - AC_CONFIG_FILES(mlxsign_lib/Makefile) - ]) +@@ -370,11 +366,6 @@ AS_IF([test "x$enable_openssl" = "xyes"], [ + [AC_CONFIG_FILES(mlxsign_lib/Makefile)], + [AC_MSG_ERROR([Required OpenSSL version >= $MIN_OPENSSL_VER (or use --disable-openssl)])]) + ]) - -if [ test "x$enable_openssl" = "xno" ] && \ - [ test "x$enable_fw_mgr" = "xyes" ] ; then - AC_MSG_ERROR([--enable-fw-mgr cannot be used with --disabled-openssl.]) -fi AS_IF([test "x$enable_fw_mgr" = "xyes"], [ AC_CONFIG_FILES(mlxfwupdate/Makefile) diff --git a/sysutils/mstflint/files/extrat-patch-mlxarchive_Makefile.am b/sysutils/mstflint/files/extrat-patch-mlxarchive_Makefile.am index e797e8d9ee5d..2a953c64007d 100644 --- a/sysutils/mstflint/files/extrat-patch-mlxarchive_Makefile.am +++ b/sysutils/mstflint/files/extrat-patch-mlxarchive_Makefile.am @@ -1,26 +1,19 @@ ---- mlxarchive/Makefile.am.orig 2020-01-05 16:50:06.000000000 +0100 -+++ mlxarchive/Makefile.am 2020-01-09 14:15:21.405697000 +0100 -@@ -20,8 +20,6 @@ DEV_MGT_DIR = $(USER_DIR)/dev_mgt +--- mlxarchive/Makefile.am.orig 2021-11-30 12:55:03.000000000 +0100 ++++ mlxarchive/Makefile.am 2022-02-21 15:13:48.562527000 +0100 +@@ -40,8 +40,6 @@ DEV_MGT_DIR = $(USER_DIR)/dev_mgt TOOLS_CRYPTO_DIR = $(USER_DIR)/tools_crypto CMDIF_DIR = $(USER_DIR)/cmdif -CURL_LIBS = -lcurl -lssl -lcrypto -lrt - INCLUDES = $(JSON_CFLAGS) -I. \ -I$(USER_DIR) -I$(USER_DIR)/libmfa \ -I$(MTCR_DIR) -I$(USER_DIR)/include/mtcr_ul \ -@@ -64,13 +62,13 @@ mstarchive_LDADD = libmstarchive.a\ - $(USER_DIR)/xz_utils/libxz_utils.a\ - $(USER_DIR)/ext_libs/minixz/libminixz.a\ - $(USER_DIR)/xz_utils/libxz_utils.a \ -- $(CURL_LIBS)\ - -lboost_regex -lboost_filesystem -lboost_system \ - -llzma -lm $(LIBSTD_CPP) ${LDL} - +@@ -91,6 +89,7 @@ mstarchive_LDADD = libmstarchive.a\ if ENABLE_OPENSSL - mstarchive_LDADD += $(top_srcdir)/mlxsign_lib/libmlxsign.a -lcrypto + mstarchive_LDADD += $(top_srcdir)/mlxsign_lib/libmlxsign.a -lcrypto -lssl else +AM_CXXFLAGS += -DNO_OPEN_SSL endif if ENABLE_CS diff --git a/sysutils/mstflint/pkg-plist b/sysutils/mstflint/pkg-plist index f52d5f9fbdcd..2da01124f7a1 100644 --- a/sysutils/mstflint/pkg-plist +++ b/sysutils/mstflint/pkg-plist @@ -1,164 +1,166 @@ %%FWMANAGER%%bin/mstarchive bin/mstconfig bin/mstcongestion bin/mstflint %%FWMANAGER%%bin/mstfwmanager bin/mstfwreset bin/mstfwtrace %%ADAB%%bin/mstlink bin/mstmcra bin/mstmread bin/mstmtserver bin/mstmwrite bin/mstprivhost %%ADAB%%bin/mstreg bin/mstregdump bin/mstresourcedump bin/mstresourceparse bin/mstvpd include/mstflint/cmdif/icmd_cif_common.h include/mstflint/cmdif/icmd_cif_open.h include/mstflint/common/compatibility.h include/mstflint/mtcr.h include/mstflint/mtcr_com_defs.h include/mstflint/tools_layouts/adb_to_c_utils.h include/mstflint/tools_layouts/icmd_layouts.h %%ADAB%%lib/libadb_parser.a lib/libcmdif.a lib/libdev_mgt.a %%ADAB%%lib/libmodules_lib.a %%FWMANAGER%%lib/libmstarchive.a %%ADAB%%lib/libmstreg_lib.a %%ADAB%%lib/libprint_util_lib.a lib/libreg_access.a lib/libtools_layouts.a lib/mstflint/libmtcr_ul.a lib/mstflint/python_tools/c_dev_mgt.so lib/mstflint/python_tools/ccmdif.so lib/mstflint/python_tools/cmdif.py lib/mstflint/python_tools/cmtcr.so lib/mstflint/python_tools/dev_mgt.py lib/mstflint/python_tools/mft_logger.py lib/mstflint/python_tools/mlxpci/binary_file.py lib/mstflint/python_tools/mlxpci/mlxpci_lib.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/__init__.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/cmd_reg_mcam.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/cmd_reg_mfrl.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/cmd_reg_mpcir.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/logger.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mcra.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlnx_peripheral_components.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlxfwreset_mlnxdriver.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlxfwreset_status_checker.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlxfwreset_utils.py lib/mstflint/python_tools/mstfwreset/mlxfwresetlib/pci_device.py lib/mstflint/python_tools/mstfwreset/mstfwreset.py lib/mstflint/python_tools/mstfwtrace/fw_trace_utilities.py lib/mstflint/python_tools/mstfwtrace/mstfwtrace.py lib/mstflint/python_tools/mstfwtrace/secure_fw_trace.py lib/mstflint/python_tools/mstprivhost/mstprivhost.py lib/mstflint/python_tools/mstresourcedump/__init__.py lib/mstflint/python_tools/mstresourcedump/commands/CommandFactory.py lib/mstflint/python_tools/mstresourcedump/commands/DumpCommand.py lib/mstflint/python_tools/mstresourcedump/commands/QueryCommand.py lib/mstflint/python_tools/mstresourcedump/commands/ResDumpCommand.py lib/mstflint/python_tools/mstresourcedump/commands/__init__.py lib/mstflint/python_tools/mstresourcedump/fetchers/CapabilityFetcher.py lib/mstflint/python_tools/mstresourcedump/fetchers/ResourceDumpFetcher.py lib/mstflint/python_tools/mstresourcedump/fetchers/__init__.py lib/mstflint/python_tools/mstresourcedump/filters/SegmentsFilter.py lib/mstflint/python_tools/mstresourcedump/filters/__init__.py lib/mstflint/python_tools/mstresourcedump/mstresourcedump.py lib/mstflint/python_tools/mstresourcedump/resource_data/DataPrinter.py lib/mstflint/python_tools/mstresourcedump/resource_data/DumpData.py lib/mstflint/python_tools/mstresourcedump/resource_data/QueryData.py lib/mstflint/python_tools/mstresourcedump/resource_data/__init__.py lib/mstflint/python_tools/mstresourcedump/segments/CommandSegment.py lib/mstflint/python_tools/mstresourcedump/segments/ErrorSegment.py lib/mstflint/python_tools/mstresourcedump/segments/InfoSegment.py lib/mstflint/python_tools/mstresourcedump/segments/MenuRecord.py lib/mstflint/python_tools/mstresourcedump/segments/MenuSegment.py lib/mstflint/python_tools/mstresourcedump/segments/NoticeSegment.py lib/mstflint/python_tools/mstresourcedump/segments/RefSegment.py lib/mstflint/python_tools/mstresourcedump/segments/ResourceSegment.py lib/mstflint/python_tools/mstresourcedump/segments/Segment.py lib/mstflint/python_tools/mstresourcedump/segments/SegmentCreator.py lib/mstflint/python_tools/mstresourcedump/segments/SegmentFactory.py lib/mstflint/python_tools/mstresourcedump/segments/TerminateSegment.py lib/mstflint/python_tools/mstresourcedump/segments/__init__.py lib/mstflint/python_tools/mstresourcedump/utils/__init__.py lib/mstflint/python_tools/mstresourcedump/utils/Exceptions.py lib/mstflint/python_tools/mstresourcedump/utils/constants.py lib/mstflint/python_tools/mstresourcedump/validation/ArgToMenuVerifier.py lib/mstflint/python_tools/mstresourcedump/validation/CapabilityValidator.py lib/mstflint/python_tools/mstresourcedump/validation/__init__.py lib/mstflint/python_tools/mstresourceparse/__init__.py lib/mstflint/python_tools/mstresourceparse/mstresourceparse.py lib/mstflint/python_tools/mstresourceparse/parsers/AdbParser.py lib/mstflint/python_tools/mstresourceparse/parsers/Parser.py lib/mstflint/python_tools/mstresourceparse/parsers/__init__.py lib/mstflint/python_tools/mstresourceparse/resource_data/AdbData.py lib/mstflint/python_tools/mstresourceparse/resource_data/DataPrinter.py lib/mstflint/python_tools/mstresourceparse/resource_data/RawData.py lib/mstflint/python_tools/mstresourceparse/resource_data/__init__.py lib/mstflint/python_tools/mstresourceparse/segments/CommandSegment.py lib/mstflint/python_tools/mstresourceparse/segments/ErrorSegment.py lib/mstflint/python_tools/mstresourceparse/segments/InfoSegment.py lib/mstflint/python_tools/mstresourceparse/segments/MenuRecord.py lib/mstflint/python_tools/mstresourceparse/segments/MenuSegment.py lib/mstflint/python_tools/mstresourceparse/segments/NoticeSegment.py lib/mstflint/python_tools/mstresourceparse/segments/RefSegment.py lib/mstflint/python_tools/mstresourceparse/segments/ResourceSegment.py lib/mstflint/python_tools/mstresourceparse/segments/Segment.py lib/mstflint/python_tools/mstresourceparse/segments/SegmentCreator.py lib/mstflint/python_tools/mstresourceparse/segments/SegmentFactory.py lib/mstflint/python_tools/mstresourceparse/segments/TerminateSegment.py lib/mstflint/python_tools/mstresourceparse/segments/__init__.py lib/mstflint/python_tools/mstresourceparse/utils/Exceptions.py lib/mstflint/python_tools/mstresourceparse/utils/__init__.py lib/mstflint/python_tools/mstresourceparse/utils/constants.py lib/mstflint/python_tools/mtcr.py lib/mstflint/python_tools/regaccess.py lib/mstflint/python_tools/rreg_access.so lib/mstflint/python_tools/tools_version.py man/man1/mstarchive.1.gz man/man1/mstcongestion.1.gz man/man1/mstconfig.1.gz man/man1/mstflint.1.gz man/man1/mstfwmanager.1.gz man/man1/mstfwreset.1.gz man/man1/mstfwtrace.1.gz man/man1/mstlink.1.gz man/man1/mstmcra.1.gz man/man1/mstmread.1.gz man/man1/mstmtserver.1.gz man/man1/mstmwrite.1.gz man/man1/mstprivhost.1.gz man/man1/mstreg.1.gz man/man1/mstregdump.1.gz man/man1/mstresourcedump.1.gz man/man1/mstvpd.1.gz %%DATADIR%%/BlueField.csv %%DATADIR%%/BlueField2.csv +%%DATADIR%%/BlueField3.csv %%DATADIR%%/ConnectIB.csv %%DATADIR%%/ConnectX2.csv %%DATADIR%%/ConnectX3.csv %%DATADIR%%/ConnectX3Pro.csv %%DATADIR%%/ConnectX4.csv %%DATADIR%%/ConnectX4LX.csv %%DATADIR%%/ConnectX5.csv %%DATADIR%%/ConnectX6.csv %%DATADIR%%/ConnectX6DX.csv %%DATADIR%%/ConnectX6LX.csv %%DATADIR%%/ConnectX7.csv %%DATADIR%%/InfiniScaleIV.csv %%DATADIR%%/Quantum.csv %%DATADIR%%/Spectrum.csv +%%DATADIR%%/Spectrum2.csv %%DATADIR%%/Spectrum3.csv %%DATADIR%%/SwitchIB.csv %%DATADIR%%/SwitchIB2.csv %%DATADIR%%/SwitchX.csv %%DATADIR%%/mlxconfig_dbs/mlxconfig_host.db %%DATADIR%%/mlxconfig_dbs/mlxconfig_switch.db %%ADAB%%%%DATADIR%%/prm_dbs/hca/ext/register_access_table.adb %%ADAB%%%%DATADIR%%/prm_dbs/switch/ext/register_access_table.adb