gentoo auto-resync : 24:04:2023 - 12:10:01

4 files changed, 107 insertions, 0 deletions

diff --git a/sys-fabric/Manifest.gz b/sys-fabric/Manifest.gz
index 260c3aa55a6f..741a3fbd132b 100644
--- a/sys-fabric/Manifest.gz
+++ b/sys-fabric/Manifest.gz
diff --git a/sys-fabric/mstflint/Manifest b/sys-fabric/mstflint/Manifest
index a728fd653457..0485af7ab0c6 100644
--- a/sys-fabric/mstflint/Manifest
+++ b/sys-fabric/mstflint/Manifest
@@ -1,5 +1,8 @@
+AUX mstflint-4.23.0_p1-C99-compat.patch 1787 BLAKE2B 848e050e532d28bdd01e58770a0a5730edd46e874b4e9f8a221b7e7e5bf9665441656cce5661d3468afb85cd17b1a0b42fd665452b657ef3502f4bd781f58206 SHA512 f639e65d6a152fc6e8f466230d413c9891ad3ae9a0abaea146281d32e164b46de6b719fdb0dcde3be4b61ece710a46857ddea7e922018d17b14867e8f744432d
 DIST mstflint-4.18.0_p1.tar.gz 4877851 BLAKE2B 7fb995561155ccc73b0c36d2994c0398483a92788c5ce045f0263a3e5b0ff7230ca8bb0f5b821e957d5879e0629f11716b179e3bc581849335cc95715631c1d6 SHA512 aed2302dc88b9b95892eb6dd929a922ac6257ddae808db656c7fd01c393f9f0a0d3aa4e13da6c07fe0118cd48a43795f39cc16e619408b05e6bed7d085dbf0d4
 DIST mstflint-4.20.0_p1.tar.gz 5176386 BLAKE2B 065fbf1884de70b57b602bb2a46e34c903b7419050622f2e6d55589f066555a43e781e35cfa4751f4d3af4394f3bbcff3c61e5618acb6696d0c22790ccaf50b8 SHA512 7298c425831f6e8f80145fb0f79af9d63ed013eeac6a99a5d9fe804a6e5c044ecffaf0ce62cd3edd07d185732bdb6ae3a99ecbb31b94047831d710b0b7fe1738
+DIST mstflint-4.23.0_p1.tar.gz 6269497 BLAKE2B 95c8fda6a1532baa50de7bcfffc128d24f30c41e670ee9fb19193025dee75fecf3b3e5bebec30bfd7ce9cc138c8eb61ba66a24d14ccec304cc75cae95d62995f SHA512 e0f98587272334d30910b7e8ea4c61ee0404924c85bfedd298ef0ae9321b177d56c8469588a2f59bc1584da79cd2908a222f3608b240d3b5498fb0cd87c06146
 EBUILD mstflint-4.18.0_p1-r1.ebuild 1146 BLAKE2B 755ea9ca06654fef57db5b9214070e2f50fafdeed8abe7fb7c65b58847356d22e09e155a07bcdb9d5f7b27a9c50cca8f364d3ef95ae23b5d654cbf3f63083901 SHA512 762063171c8b955e99b056effa180ca807748a978b09c41ba724854b4510fe6a763e8b946eac2db6f39f18e608b992c8fdc610dfbdb5336c94f6a797b2341501
 EBUILD mstflint-4.20.0_p1.ebuild 1146 BLAKE2B 01249f9479758a5a7d5f52dc0d0916a71258e652323b8dcb5967cd4e612991e4980c894b695693d6731ba67011b028e41e91b9b5ca8bb36b8ddd1223fec686cd SHA512 16fb7db58489df9ae3494b8d84dca4f53fc53806a1af93a8968df7d47d817dd149a7bd643149e418ca189137e8d5c9ccd5c3b538c04b3f0a4a2ace41060cd128
+EBUILD mstflint-4.23.0_p1.ebuild 1363 BLAKE2B 9eb862adb5cb498e0f1a0d59307ee4ff9fb08587eefe7663fa044002240151b397848de41efdc265c55186b9abeebeb8496187ebcf52f3326b1774562245b5b6 SHA512 0386523409622bec2ce6f6524afed7d2b36f5bf8632cccb35805de1539c3663fb8ed185d84dab2a557e5aa6c4dc55ce0ed542224acedf6b932fb23a183596ff6
 MISC metadata.xml 535 BLAKE2B 1e72f523ffe6502539cb60113b7c5c65528552aff7b5aab7e944afa982b0551a8c561cd58b516ba6daa76380598d8f24ec47eb63b7890c092f2aa40ba5f1af41 SHA512 5b95d56f53b0e89ace5a1032a063a3f606c44f5a913e87e9d7c2b61e7dac1a9c44c44819648996668c53c106bb085e9f50c10050fca6e457f39b40d48fea79c8
diff --git a/sys-fabric/mstflint/files/mstflint-4.23.0_p1-C99-compat.patch b/sys-fabric/mstflint/files/mstflint-4.23.0_p1-C99-compat.patch
new file mode 100644
index 000000000000..7b9b90ea9360
--- /dev/null
+++ b/sys-fabric/mstflint/files/mstflint-4.23.0_p1-C99-compat.patch
@@ -0,0 +1,55 @@
+From 3d033115fd0937b675b75f5d1fc12dc015efcf07 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Sun, 23 Apr 2023 18:30:33 +0200
+Subject: [PATCH] Add additional #include directives for C99 compatibility
+
+https://github.com/Mellanox/mstflint/pull/774
+Avoid implicit declarations of cibfw_register_mfai_pack,
+cibfw_register_mfai_unpack, cibfw_register_mfai_size by including
+<tools_layouts/cibfw_layouts.h>, and of getenv by including
+<stdlib.h>.
+---
+ mflash/mflash_gw.c      | 2 ++
+ mflash/mflash_new_gw.c  | 3 +++
+ reg_access/reg_access.c | 1 +
+ 3 files changed, 6 insertions(+)
+
+diff --git a/mflash/mflash_gw.c b/mflash/mflash_gw.c
+index f296700d..55e5cb9d 100644
+--- a/mflash/mflash_gw.c
++++ b/mflash/mflash_gw.c
+@@ -43,6 +43,8 @@
+ #include "mflash_access_layer.h"
+ #include "flash_int_defs.h"
+ 
++#include <stdlib.h>
++
+ #ifdef __WIN__
+ //
+ // Windows (Under DDK)
+diff --git a/mflash/mflash_new_gw.c b/mflash/mflash_new_gw.c
+index 3bd044ea..4d0bb21d 100644
+--- a/mflash/mflash_new_gw.c
++++ b/mflash/mflash_new_gw.c
+@@ -42,6 +42,9 @@
+ #include "mflash_dev_capability.h"
+ #include "mflash_access_layer.h"
+ #include "flash_int_defs.h"
++
++#include <stdlib.h>
++
+ #define DPRINTF(args)                            \
+     do                                           \
+     {                                            \
+diff --git a/reg_access/reg_access.c b/reg_access/reg_access.c
+index 622b1a15..736e67b3 100644
+--- a/reg_access/reg_access.c
++++ b/reg_access/reg_access.c
+@@ -37,6 +37,7 @@
+ #include <tools_layouts/reg_access_hca_layouts.h>
+ #include <tools_layouts/reg_access_switch_layouts.h>
+ #include <tools_layouts/tools_open_layouts.h>
++#include <tools_layouts/cibfw_layouts.h>
+ 
+ #define REG_ID_PCNR              0x5050
+ #define REG_ID_PAOS              0x5006
diff --git a/sys-fabric/mstflint/mstflint-4.23.0_p1.ebuild b/sys-fabric/mstflint/mstflint-4.23.0_p1.ebuild
new file mode 100644
index 000000000000..44fd3ec31adb
--- /dev/null
+++ b/sys-fabric/mstflint/mstflint-4.23.0_p1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Mstflint - an open source version of MFT (Mellanox Firmware Tools)"
+HOMEPAGE="https://github.com/Mellanox/mstflint"
+LICENSE="|| ( GPL-2 BSD-2 )"
+KEYWORDS="~amd64 ~x86"
+EGIT_COMMIT="acfaf553f2f571b1f9256b6cd558eafa767d9172"
+MY_PV=${PV/_p/-}
+MY_P=""
+SRC_URI="https://github.com/Mellanox/mstflint/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+IUSE="adb-generic-tools inband ssl"
+SLOT="0"
+RDEPEND="dev-db/sqlite:3=
+	sys-libs/zlib:=
+	inband? ( sys-cluster/rdma-core )
+	adb-generic-tools? (
+		dev-libs/boost:=
+		dev-libs/expat:=
+	)
+	ssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${PN}-${MY_PV}"
+PATCHES=("${FILESDIR}"/mstflint-4.23.0_p1-C99-compat.patch)
+
+src_prepare() {
+	default
+	sed -e 's: \*.o: .libs/*.o:' -e 's: tools_dev_types.o: .libs/tools_dev_types.o:' \
+		-i cmdif/Makefile.am dev_mgt/Makefile.am reg_access/Makefile.am || die
+	echo '#define TOOLS_GIT_SHA "'${EGIT_COMMIT}'"' > ./common/gitversion.h || die
+}
+
+src_configure() {
+	eautoreconf
+	econf $(use_enable inband) $(use_enable ssl openssl) $(use adb-generic-tools && printf -- '--enable-adb-generic-tools')
+}
+
+src_compile() {
+	if use adb-generic-tools; then
+		pushd ext_libs/json >/dev/null || die
+		emake
+		popd >/dev/null || die
+	fi
+	default
+}