From: Jan Rękorajski Date: Wed, 31 Oct 2018 20:44:52 +0000 (+0100) Subject: - up to 4.10.0-3 X-Git-Tag: auto/th/mstflint-4.10.0-1~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=4cccf41516e06ccee3042b6a5db9734ebed87810;p=packages%2Fmstflint.git - up to 4.10.0-3 --- diff --git a/mstflint-types.patch b/mstflint-types.patch deleted file mode 100644 index 4d1ec38..0000000 --- a/mstflint-types.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- mstflint-4.4.0/common/compatibility.h.orig 2016-05-24 14:52:16.000000000 +0200 -+++ mstflint-4.4.0/common/compatibility.h 2016-06-26 13:10:41.042393009 +0200 -@@ -40,7 +40,7 @@ - - #include - --#if defined(__ia64__) || defined(__x86_64__) || defined(__PPC64__) -+#if (defined(__ia64__) || defined(__x86_64__) || defined(__PPC64__)) && !defined(__ILP32__) - #define U64L "l" - #else - #define U64L "ll" -@@ -92,8 +92,8 @@ - #define U16H_FMT "0x%04x" - #define U8H_FMT "0x%02x" - --#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) --# if defined(__MINGW32__) || defined(__MINGW64__) -+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(__ILP32__) -+# if defined(__MINGW32__) || defined(__MINGW64__) /* || defined(__GNUC__) */ - # include - # define U64D_FMT "0x%"PRId64 - # define U64H_FMT "0x%"PRIx64 ---- mstflint-4.4.0/mtcr_ul/packets_common.h.orig 2016-05-24 14:52:19.000000000 +0200 -+++ mstflint-4.4.0/mtcr_ul/packets_common.h 2016-06-26 13:26:41.285456968 +0200 -@@ -162,7 +162,7 @@ - /* define macros for print fields */ - //#if defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__) - /* --#if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__)) -+#if !defined(UEFI_BUILD) && !defined(__ILP32__) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__)) - # define U64H_FMT "0x%016lx" - # define U64D_FMT "%lu" - # define U32H_FMT "0x%08x" -@@ -170,7 +170,7 @@ - # define U8H_FMT "0x%02x" - # define U32D_FMT "%u" - # define STR_FMT "%s" --#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) -+#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(__ILP32__) - # define U64H_FMT "0x%016llx" - # define U64D_FMT "%llu" - # define U32H_FMT "0x%08x" ---- mstflint-4.4.0/tools_layouts/adb_to_c_utils.h.orig 2016-06-26 13:28:56.112446417 +0200 -+++ mstflint-4.4.0/tools_layouts/adb_to_c_utils.h 2016-06-26 13:28:59.142603500 +0200 -@@ -169,7 +169,7 @@ - #define U16H_FMT "0x%04x" - #define U8H_FMT "0x%02x" - --#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) -+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(__ILP32__) - # if defined(__MINGW32__) || defined(__MINGW64__) - # include - # define U64D_FMT "0x%"PRId64 diff --git a/mstflint.spec b/mstflint.spec index bdf2ee5..dedbfe1 100644 --- a/mstflint.spec +++ b/mstflint.spec @@ -1,14 +1,15 @@ Summary: Firmware burning and diagnostic tools for Mellanox HCA/NIC cards Summary(pl.UTF-8): Narzędzia modyfikujące firmware i diagnostyczne dla kart HCA/NIC Mellanox Name: mstflint -Version: 4.4.0 -Release: 3 +Version: 4.10.0 +%define upstream_ver %{version}-3 +Release: 1 License: BSD or GPL v2 Group: Networking/Utilities -Source0: http://www.openfabrics.org/downloads/mstflint/%{name}-%{version}.tar.gz -# Source0-md5: 8846152be0581c76396e60e94e953c59 -Patch0: %{name}-types.patch -URL: http://www.openfabrics.org/ +Source0: https://github.com/Mellanox/mstflint/releases/download/v%{upstream_ver}/%{name}-%{upstream_ver}.tar.gz +# Source0-md5: 0fd75b78de3fc46d2cf951eead225a5b +Patch0: openssl-1.1.patch +URL: https://github.com/Mellanox/mstflint BuildRequires: libibmad-devel BuildRequires: libstdc++-devel BuildRequires: openssl-devel @@ -42,7 +43,10 @@ Pliki nagłówkowe do dostępu do kart HCA/NIC Mellanox. %build %configure \ - --enable-cs + --enable-cs \ + --enable-fw-mgr \ + --enable-xml2 \ + --enable-openssl %{__make} %install @@ -57,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc LICENSE README -%attr(755,root,root) %{_bindir}/hca_self_test.ofed +%{_sysconfdir}/mstflint/ca-bundle.crt %attr(755,root,root) %{_bindir}/mstconfig %attr(755,root,root) %{_bindir}/mstflint %attr(755,root,root) %{_bindir}/mstmcra @@ -66,6 +70,31 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/mstmwrite %attr(755,root,root) %{_bindir}/mstregdump %attr(755,root,root) %{_bindir}/mstvpd +%attr(755,root,root) %{_bindir}/mstcongestion +%attr(755,root,root) %{_bindir}/mstfwmanager +%attr(755,root,root) %{_bindir}/mstfwreset +%dir %{_libdir}/mstflint +%dir %{_libdir}/mstflint/python_tools +%attr(755,root,root) %{_libdir}/mstflint/python_tools/c_dev_mgt.so +%attr(755,root,root) %{_libdir}/mstflint/python_tools/ccmdif.so +%{_libdir}/mstflint/python_tools/cmdif.py +%attr(755,root,root) %{_libdir}/mstflint/python_tools/cmtcr.so +%{_libdir}/mstflint/python_tools/dev_mgt.py +%dir %{_libdir}/mstflint/python_tools/mstfwreset +%dir %{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib +%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/__init__.py +%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/logger.py +%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/mcra.py +%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlnx_peripheral_components.py +%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlxfwreset_mlnxdriver.py +%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlxfwreset_status_checker.py +%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/mlxfwreset_utils.py +%{_libdir}/mstflint/python_tools/mstfwreset/mlxfwresetlib/pci_device.py +%{_libdir}/mstflint/python_tools/mstfwreset/mstfwreset.py +%{_libdir}/mstflint/python_tools/mtcr.py +%{_libdir}/mstflint/python_tools/regaccess.py +%attr(755,root,root) %{_libdir}/mstflint/python_tools/rreg_access.so +%{_libdir}/mstflint/python_tools/tools_version.py %{_datadir}/mstflint %{_mandir}/man1/mstconfig.1* %{_mandir}/man1/mstflint.1* @@ -78,6 +107,5 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) -%dir %{_libdir}/mstflint %{_libdir}/mstflint/libmtcr_ul.a %{_includedir}/mstflint diff --git a/openssl-1.1.patch b/openssl-1.1.patch new file mode 100644 index 0000000..1a762f8 --- /dev/null +++ b/openssl-1.1.patch @@ -0,0 +1,22 @@ +--- mstflint-4.10.0-3/mlxsign_lib/mlxsign_lib.cpp.orig 2018-08-28 15:36:51.000000000 +0200 ++++ mstflint-4.10.0-3/mlxsign_lib/mlxsign_lib.cpp 2018-10-31 21:24:51.980647273 +0100 +@@ -360,8 +360,7 @@ + + MlxSignHMAC::MlxSignHMAC() + { +- ctx = malloc(sizeof(HMAC_CTX)); +- HMAC_CTX_init((HMAC_CTX*)ctx); ++ ctx = HMAC_CTX_new(); + } + + int MlxSignHMAC::setKey(const std::vector& key) +@@ -415,8 +414,7 @@ + + MlxSignHMAC::~MlxSignHMAC() + { +- HMAC_CTX_cleanup((HMAC_CTX*)ctx); +- free(ctx); ++ HMAC_CTX_free((HMAC_CTX*)ctx); + } + + #endif //ENABLE_OPENSSL