From nobody Tue Feb 14 12:36:36 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PGLLD5lH5z3rv0H; Tue, 14 Feb 2023 12:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PGLLD5F5jz3vLH; Tue, 14 Feb 2023 12:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676378196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TkobixVm3LqxpNBXrzlN5ADTZMw8xzVh28OKMRmuDko=; b=Br643aQouvcP2aqkZatQrbVWuaCkBTEuVtYU4DIzi7Z4xUF954HO/ooDtJqruiz//XZypT eLUMaMgTOlWSojcTxV1+HOyRJ4B/BlRR43aX/zG0KwH/HDko5DCFaAb6AdkJuU+ZoCMpgV 6I5MYbm0US7rUrjVtuKdeVSml8hhX5wy+AeJbAAbwE5iDrOvbUs7PvZ/v6crsWJmGFMzi6 GwbqiyrJBZ9htOcC3BssxdX4s0ecYIKD5NKdADl4l3Eu3Pj8PNXadMYt3bZHggempFNHJa /di1TvwwvZvgDWqB6zEB/P0OhvpTVgEck7YrBnyO/ag57NBR554PcILBCXKcOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676378196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TkobixVm3LqxpNBXrzlN5ADTZMw8xzVh28OKMRmuDko=; b=ZbdgdLoOv+J6fF/qjhMEZIveRMJ0jGLcgEEJBRybB+/nPXRXCi6/LSs9tUt5eRV/9UQpH4 HhQBoMZWLZ+GXxBYbcd3xL1wEEs7wpI90hPki5ezzFYgQ1V4MMLapqcoKGl4iq+BKNYbsd rpHlG2iKHUm38jzUMMG3JlXYQijGDNciYHaCNIhNd+9j6+nEaA9gQxNdiN5XQD3Lky25v+ yyL/lUeE7O4bpPsz0HtFstj6NaXGTzNAg81KQzgFHRbHPme+yfd222kcu7aImMojzQ/XS5 RqWn+PAWcDB8BHYu4ub9osV4XR73G17lOHdNxPfWP6QpHf6NhViu4Ajq3YBeLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676378196; a=rsa-sha256; cv=none; b=f+T3oPb+YKFv2mNvzC7mjdq8bas95fSncHrApwNVWwWTNnsQEdoOsh0I5PLmxBmRWG3oO6 rQ+/FD1rw6Kf3nagqT0Z26QhJG5NzwuHwpF7+YQew4kuzVvaJfX8fsWvUBnKPcZHjhwoiG fNo+QbwNsJ6gMELh2KLuhov7GFnhOQeGJ+efTqV4G9JildQ2qNFfMvRoyikalSp3LBZmni uYqS2mS1xv0qkocvaXWD6H1VkjquyVTWX9dQJMxONhNVU7pBtZ0BDbSPJB5cXQ7mN4IN8q dZNnfCQAhNzrjHfPzgTe/FcnW0jkgEO1EFA0YpasmRtQaVh/aHiIAMiSngihCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PGLLD4HQ3zykK; Tue, 14 Feb 2023 12:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31ECaaB2086770; Tue, 14 Feb 2023 12:36:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31ECaaK2086769; Tue, 14 Feb 2023 12:36:36 GMT (envelope-from git) Date: Tue, 14 Feb 2023 12:36:36 GMT Message-Id: <202302141236.31ECaaK2086769@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: c0c0b1bc86ec - main - net/libiscsi: update to HEAD of 2023-02-08 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0c0b1bc86ecc4b3265847a8f22dee14dd484fcf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0c0b1bc86ecc4b3265847a8f22dee14dd484fcf commit c0c0b1bc86ecc4b3265847a8f22dee14dd484fcf Author: Martin Birgmeier AuthorDate: 2023-02-13 13:21:46 +0000 Commit: Fernando Apesteguía CommitDate: 2023-02-14 12:31:20 +0000 net/libiscsi: update to HEAD of 2023-02-08 This fixes the build in 14-current. PR: 269502 Reported by: d8zNeCFG@aon.at (maintainer) --- net/libiscsi/Makefile | 5 +++-- net/libiscsi/distinfo | 6 +++--- net/libiscsi/files/patch-configure.ac | 16 ++++++++-------- net/libiscsi/files/patch-lib_login.c | 16 ---------------- net/libiscsi/files/patch-lib_socket.c | 11 +++++++++++ net/libiscsi/pkg-plist | 1 + 6 files changed, 26 insertions(+), 29 deletions(-) diff --git a/net/libiscsi/Makefile b/net/libiscsi/Makefile index 47c1a225265b..d3e542c28a76 100644 --- a/net/libiscsi/Makefile +++ b/net/libiscsi/Makefile @@ -1,5 +1,5 @@ PORTNAME= libiscsi -DISTVERSION= 1.19.0 +DISTVERSION= 1.19.0.230208 CATEGORIES= net MAINTAINER= d8zNeCFG@aon.at @@ -11,11 +11,12 @@ LICENSE_COMB= multi LICENSE_FILE_LGPL21+ = ${WRKSRC}/LICENCE-LGPL-2.1.txt LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENCE-GPL-2.txt -USES= autoreconf compiler:c11 libtool pathfix +USES= autoreconf compiler:c11 gmake libtool pathfix USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= sahlberg +GH_TAGNAME= 22f7b2656776 GNU_CONFIGURE= yes diff --git a/net/libiscsi/distinfo b/net/libiscsi/distinfo index 8f222be13bb2..f874ea814454 100644 --- a/net/libiscsi/distinfo +++ b/net/libiscsi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588264800 -SHA256 (sahlberg-libiscsi-1.19.0_GH0.tar.gz) = c7848ac722c8361d5064654bc6e926c2be61ef11dd3875020a63931836d806df -SIZE (sahlberg-libiscsi-1.19.0_GH0.tar.gz) = 284969 +TIMESTAMP = 1676144386 +SHA256 (sahlberg-libiscsi-1.19.0.230208-22f7b2656776_GH0.tar.gz) = e4560a88fc37465ac1ec43354c788141fac4cd459be039ee78df6a49b586b035 +SIZE (sahlberg-libiscsi-1.19.0.230208-22f7b2656776_GH0.tar.gz) = 293039 diff --git a/net/libiscsi/files/patch-configure.ac b/net/libiscsi/files/patch-configure.ac index db7ed62873b3..38166307dcde 100644 --- a/net/libiscsi/files/patch-configure.ac +++ b/net/libiscsi/files/patch-configure.ac @@ -1,12 +1,12 @@ ---- configure.ac.orig 2019-07-13 22:04:44 UTC -+++ configure.ac -@@ -144,7 +144,8 @@ AC_CACHE_CHECK([for iSER support],libiscsi_cv_HAVE_LIN - AC_TRY_COMPILE([ +--- ./configure.ac.ORIG 2023-02-11 20:12:38.532565000 +0100 ++++ ./configure.ac 2023-02-11 20:14:27.194137000 +0100 +@@ -170,7 +170,8 @@ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #include --#include ], +-#include ]], +#include -+#error not on FreeBSD], - [int ibv = IBV_WC_SEND;], - libiscsi_cv_HAVE_LINUX_ISER=yes,libiscsi_cv_HAVE_LINUX_ISER=no)]) ++#error not on FreeBSD]], + [[int ibv = IBV_WC_SEND;]])], + [libiscsi_cv_HAVE_LINUX_ISER=yes],[libiscsi_cv_HAVE_LINUX_ISER=no])]) if test x"$libiscsi_cv_HAVE_LINUX_ISER" = x"yes"; then diff --git a/net/libiscsi/files/patch-lib_login.c b/net/libiscsi/files/patch-lib_login.c deleted file mode 100644 index 209886e35cec..000000000000 --- a/net/libiscsi/files/patch-lib_login.c +++ /dev/null @@ -1,16 +0,0 @@ ---- lib/login.c.orig 2019-07-13 22:04:44 UTC -+++ lib/login.c -@@ -1242,11 +1242,11 @@ iscsi_process_login_reply(struct iscsi_context *iscsi, - - /* iSER specific keys */ - if (!strncmp(ptr, "InitiatorRecvDataSegmentLength=", 31)) { -- iscsi->initiator_max_recv_data_segment_length = MIN(strtol(ptr + 31, NULL, 10), -+ iscsi->initiator_max_recv_data_segment_length = MIN(strtoul(ptr + 31, NULL, 10), - iscsi->initiator_max_recv_data_segment_length); - } - if (!strncmp(ptr, "TargetRecvDataSegmentLength=", 28)) { -- iscsi->target_max_recv_data_segment_length = MIN(strtol(ptr + 28, NULL, 10), -+ iscsi->target_max_recv_data_segment_length = MIN(strtoul(ptr + 28, NULL, 10), - iscsi->target_max_recv_data_segment_length); - } - diff --git a/net/libiscsi/files/patch-lib_socket.c b/net/libiscsi/files/patch-lib_socket.c new file mode 100644 index 000000000000..8b00a0c73bf9 --- /dev/null +++ b/net/libiscsi/files/patch-lib_socket.c @@ -0,0 +1,11 @@ +--- ./lib/socket.c.ORIG 2023-02-11 20:12:27.340472000 +0100 ++++ ./lib/socket.c 2023-02-11 21:13:25.802721000 +0100 +@@ -140,7 +140,7 @@ + pdu->next = NULL; + } + +-void iscsi_decrement_iface_rr() { ++void iscsi_decrement_iface_rr(void) { + iface_rr--; + } + diff --git a/net/libiscsi/pkg-plist b/net/libiscsi/pkg-plist index a5cb3cd09132..641ff598d859 100644 --- a/net/libiscsi/pkg-plist +++ b/net/libiscsi/pkg-plist @@ -1,6 +1,7 @@ bin/iscsi-inq bin/iscsi-ls bin/iscsi-perf +bin/iscsi-pr bin/iscsi-readcapacity16 bin/iscsi-swp include/iscsi/iscsi.h