git: 324e6d691a08 - main - sysutils/mstflint: Update to 4.18.0-1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Olivier Cochard <olivier_at_FreeBSD.org>
Date: Mon, 21 Feb 2022 14:47:10 UTC
The branch main has been updated by olivier:

URL: https://cgit.FreeBSD.org/ports/commit/?id=324e6d691a08da44dcfec794a1b559d0fc88f40c

commit 324e6d691a08da44dcfec794a1b559d0fc88f40c
Author:     Olivier Cochard <olivier@FreeBSD.org>
AuthorDate: 2022-02-21 14:36:30 +0000
Commit:     Olivier Cochard <olivier@FreeBSD.org>
CommitDate: 2022-02-21 14:46:56 +0000

    sysutils/mstflint: Update to 4.18.0-1
    
    Reported by:    hselasky
    Sponsored by:   Netflix
---
 sysutils/mstflint/Makefile                              |  2 +-
 sysutils/mstflint/distinfo                              |  6 +++---
 sysutils/mstflint/files/extrat-patch-configure.ac       | 16 ++++++++--------
 .../mstflint/files/extrat-patch-mlxarchive_Makefile.am  | 17 +++++------------
 sysutils/mstflint/pkg-plist                             |  2 ++
 5 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/sysutils/mstflint/Makefile b/sysutils/mstflint/Makefile
index 10af903636e2..45e1f0ab92d5 100644
--- a/sysutils/mstflint/Makefile
+++ b/sysutils/mstflint/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mstflint
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.16.0-1
+DISTVERSION=	4.18.0-1
 CATEGORIES=	sysutils
 
 MAINTAINER=	hselasky@FreeBSD.org
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,6 +1,6 @@
---- 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
@@ -13,7 +13,7 @@
  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
  
@@ -22,10 +22,10 @@
  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
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,6 +1,6 @@
---- 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
  
@@ -9,16 +9,9 @@
  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
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
@@ -140,6 +140,7 @@ 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
@@ -154,6 +155,7 @@ man/man1/mstvpd.1.gz
 %%DATADIR%%/InfiniScaleIV.csv
 %%DATADIR%%/Quantum.csv
 %%DATADIR%%/Spectrum.csv
+%%DATADIR%%/Spectrum2.csv
 %%DATADIR%%/Spectrum3.csv
 %%DATADIR%%/SwitchIB.csv
 %%DATADIR%%/SwitchIB2.csv