sysutils/mstflint: Update to 4.18.0-1

Reported by:	hselasky
Sponsored by:	Netflix
This commit is contained in:
Olivier Cochard 2022-02-21 15:36:30 +01:00
parent e7b1d51aa2
commit 324e6d691a
5 changed files with 19 additions and 24 deletions

View file

@ -1,6 +1,6 @@
PORTNAME= mstflint
DISTVERSIONPREFIX= v
DISTVERSION= 4.16.0-1
DISTVERSION= 4.18.0-1
CATEGORIES= sysutils
MAINTAINER= hselasky@FreeBSD.org

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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