Update to 4.15.0-1.

PR:		250034
Approved by:	hselasky (maintainer)
Sponsored by:	Netflix

sysutils/mstflint/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	mstflint
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.14.0-3
+DISTVERSION=	4.15.0-1
 CATEGORIES=	sysutils
 
 MAINTAINER=	hselasky@FreeBSD.org
@@ -10,10 +10,10 @@ COMMENT=	Firmware Burning and Diagnostics Tools for Mellanox devices
 
 LICENSE=	BSD2CLAUSE GPLv2
 LICENSE_COMB=	dual
-LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE
+LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/LICENSE
-LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE
+LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE
 
-USES=		autoreconf libtool gmake
+USES=		autoreconf libtool gmake pkgconfig
 
 OPTIONS_DEFINE=	FWMANAGER ADAB STATIC
 OPTIONS_SUB=	yes

sysutils/mstflint/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1595260779
+TIMESTAMP = 1601554141
-SHA256 (Mellanox-mstflint-v4.14.0-3_GH0.tar.gz) = d74231e555aaa0c967022c0b75eeec82ebca62a6e1d109cc56aa3ffaf9936ca2
+SHA256 (Mellanox-mstflint-v4.15.0-1_GH0.tar.gz) = c90174b22f31a238365528cdb3ed1354d4983ec02bc9cdc87ca219e299d76683
-SIZE (Mellanox-mstflint-v4.14.0-3_GH0.tar.gz) = 4012564
+SIZE (Mellanox-mstflint-v4.15.0-1_GH0.tar.gz) = 4270839

sysutils/mstflint/files/extrat-LITE-patch-Makefile.am

@@ -1,11 +1,11 @@
---- Makefile.am.orig	2020-01-05 16:50:06.000000000 +0100
+--- Makefile.am.orig	2020-10-01 18:10:47.137747000 +0200
-+++ Makefile.am	2020-01-10 20:11:11.228348000 +0100
++++ Makefile.am	2020-10-01 18:13:35.608941000 +0200
 @@ -30,11 +30,11 @@
  # SOFTWARE.
  #--
  
--SUBDIRS = common mft_utils ext_libs $(TOOLS_CRYPTO) tools_layouts ${MTCR_CONF_DIR} mtcr_py $(MAD_IFC) reg_access cmdif $(XZ_UTILS_DIR) dev_mgt tools_res_mgmt mvpd mflash fw_comps_mgr libmfa pldmlib mlxconfig mlxfwops cmdparser $(FW_MGR_TOOLS) flint small_utils mstdump ${ADABE_TOOLS} tracers resourcedump
+-SUBDIRS = common mft_utils mft_utils/hsmclient ext_libs $(TOOLS_CRYPTO) tools_layouts ${MTCR_CONF_DIR} mtcr_py $(MAD_IFC) reg_access cmdif $(XZ_UTILS_DIR) dev_mgt tools_res_mgmt mvpd mflash fw_comps_mgr libmfa pldmlib mlxconfig mlxfwops cmdparser $(FW_MGR_TOOLS) flint small_utils mstdump ${ADABE_TOOLS} tracers resourcedump resourceparse
-+SUBDIRS = mft_utils ext_libs $(TOOLS_CRYPTO) tools_layouts ${MTCR_CONF_DIR} $(MAD_IFC) reg_access cmdif $(XZ_UTILS_DIR) dev_mgt tools_res_mgmt mvpd mflash fw_comps_mgr libmfa pldmlib mlxconfig mlxfwops cmdparser $(FW_MGR_TOOLS) flint ${ADABE_TOOLS}
++SUBDIRS = mft_utils mft_utils/hsmclient ext_libs $(TOOLS_CRYPTO) tools_layouts ${MTCR_CONF_DIR} $(MAD_IFC) reg_access cmdif $(XZ_UTILS_DIR) dev_mgt tools_res_mgmt mvpd mflash fw_comps_mgr libmfa pldmlib mlxconfig mlxfwops cmdparser $(FW_MGR_TOOLS) flint ${ADABE_TOOLS}
  
  DIST_SUBDIRS = tracers
  

sysutils/mstflint/files/patch-configure.ac

@@ -1,51 +1,6 @@
---- configure.ac.orig	2020-01-05 16:50:06.000000000 +0100
+--- configure.ac.orig	2020-10-02 01:05:50.612135000 +0200
-+++ configure.ac	2020-01-09 00:28:38.419054000 +0100
++++ configure.ac	2020-10-02 01:06:26.890856000 +0200
-@@ -100,7 +100,7 @@ fi
+@@ -233,7 +233,7 @@
- AC_MSG_CHECKING(--enable-fw-mgr argument)
- AC_ARG_ENABLE(fw-mgr,
-              [  --enable-fw-mgr        Enable compiling mstfwmanager tool and features],
--             [enable_fw_mgr="yes"],
-+             [enable_fw_mgr=$enableval],
-              [enable_fw_mgr="no"])
- AC_MSG_RESULT($enable_fw_mgr)
- if test "x$enable_fw_mgr" = "xyes"; then
-@@ -116,7 +116,7 @@ fi
- AC_MSG_CHECKING(--enable-adb-generic-tools argument)
- AC_ARG_ENABLE(adb-generic-tools,
-              [  --enable-adb-generic-tools        Enable compiling the following tools which depends on ADABE: mstreg and mstlink],
--             [enable_adb_generic_tools="yes"],
-+             [enable_adb_generic_tools=$enableval],
-              [enable_adb_generic_tools="no"])
- AC_MSG_RESULT($enable_adb_generic_tools)
- if test "x$enable_adb_generic_tools" = "xyes"; then
-@@ -143,7 +143,7 @@ AC_SUBST(ENABLE_FWMGR)
- AC_MSG_CHECKING(--enable-xml2 argument)
- AC_ARG_ENABLE(xml2,
-             [  --enable-xml2           Enable mstflint libxml2 dependent features],
--            [enable_xml2="yes"],
-+            [enable_xml2=$enableval],
-             [enable_xml2="no"])
- AC_MSG_RESULT($enable_xml2)
- if test [ "x$enable_xml2" = "xyes" ] || [ test "x$enable_fw_mgr" = "xyes" ]; then
-@@ -185,7 +185,7 @@ AM_CONDITIONAL(ENABLE_INBAND, [test  "x$enable_inband"
- AC_MSG_CHECKING(--enable-cs argument)
- AC_ARG_ENABLE(cs,
-             [  --enable-cs             Enable mstflint "checksum" command, dependant of openssl library],
--            [enable_cs="yes"],
-+            [enable_cs=$enableval],
-             [enable_cs="no"])
- AC_MSG_RESULT($enable_cs)
- if test "x$enable_cs" = "xyes"; then
-@@ -211,7 +211,7 @@ fi
- AC_MSG_CHECKING(--enable-all-static argument)
- AC_ARG_ENABLE([all_static],
-     AS_HELP_STRING([--enable-all-static], [Enable creating none dynamic executables]),
--    [enable_all_static="yes"],
-+    [enable_all_static=$enableval],
-     [enable_all_static="no"])
- AC_MSG_RESULT($enable_all_static)
- 
-@@ -237,7 +237,7 @@ AC_ARG_ENABLE([static_libstdcpp],
      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" ], [
@@ -54,12 +9,3 @@
  ])
  
  AC_ARG_ENABLE([dynamic_ld],
-@@ -267,7 +267,7 @@ AS_IF([test "x$INIPARSER_SYSTEM_AVAILABLE" = "xyes" ],
-     CXXFLAGS="$CXXFLAGS -DHAVE_INI_PARSER"
- ])
- 
--AC_SEARCH_LIBS([json_object_get], [json-c jason], [JSON_SYSTEM_AVAILABLE="yes"],[
-+AC_SEARCH_LIBS([json_object_get], [jsoncpp], [JSON_SYSTEM_AVAILABLE="yes"],[
-     JSON_SYSTEM_AVAILABLE="no"
-     JSON_CFLAGS='-I$(top_srcdir)/ext_libs/json'
-     AC_SUBST(JSON_CFLAGS)

sysutils/mstflint/pkg-plist

@@ -14,6 +14,7 @@ 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
@@ -41,6 +42,7 @@ 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
@@ -90,6 +92,31 @@ 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
@@ -123,6 +150,7 @@ man/man1/mstvpd.1.gz
 %%DATADIR%%/ConnectX6.csv
 %%DATADIR%%/ConnectX6DX.csv
 %%DATADIR%%/ConnectX6LX.csv
+%%DATADIR%%/ConnectX7.csv
 %%DATADIR%%/InfiniScaleIV.csv
 %%DATADIR%%/Quantum.csv
 %%DATADIR%%/Spectrum.csv