From nobody Tue Aug 13 18:54:17 2024 X-Original-To: dev-commits-ports-branches@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 4Wk0t2139Kz5TDbd; Tue, 13 Aug 2024 18:54:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wk0t20VY9z4nQ6; Tue, 13 Aug 2024 18:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723575258; 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=cn26a+5An4uKXVA6sHFnj4wuGoHUsakcXl8dDfDTFTc=; b=GBwJZx/J0qTZ+psKUmnxn24kuzKnHQ3MvJnE4CIKigWOw+O5UNqAgn3/aOLU8e+b7u+npD U/Fss0W0ici+/Ypo4bTuXPvTJg7WDDqKnKXEMOcMZcUTSUQCxufvkDmhIPgbyTwD+/r0lV ESV/vvkn7KpxHB9UTcNPq7gK6yfIkHEg0B24ah6of0uIZnc3QAC5vCH51vC6IXce/uCuCX tKrPX4ME7DJQmgrKwVOT3f6TNMV+iCsxFoSjJJ/Hwbbn5hLd40wuMYefI8oG8BZrQNC1RK 1nPXkNDRDzBMO+8gIhkaUaaVzTD9QTVt8UNC2NdKQ5WM87AmrU+Q9yT/FXqxqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723575258; a=rsa-sha256; cv=none; b=nLyFBi92lkxXZZYkr3tlZXLm8zU6O9Gn+dW6pRLpwTBay8kMvnrCUG7qCCJwmd/ebJNy/7 3rH/ou7cyEAqmgCqWlpuCbHP+6/2GULmXQ4ahWNkt9ZAFgEQjaASdW2/cVZX+GFrrImUC5 3BycLz427GTrtCcZjp9JLVro76a7RsztJCXZJo6n9r60k/rTtFUn5Nx1tA5T+eXAM7hXKK fr6pMw1lMBAliQNatT2WQFYIb7aGNQAPtOjyms+8r4mw+CjSxMVGykH5yB/TK955esFAsd Bm42yiuLKDdxVce4QHffiT0SQaIZBgRywIUne1DmeSHCv00kj3USvqhJtg/8Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723575258; 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=cn26a+5An4uKXVA6sHFnj4wuGoHUsakcXl8dDfDTFTc=; b=P7HGbnSgILrrOmHRFMZ+eQt+drrb3j0F7+QjaGCZuXIxXeblATPIAv67fnTcaoftjdHkyO CGhmZKALFRxJwDLZi5BIidpUoSvWCHWxBo2UMeMwEdNW3jZA8VJTKrqeOkIcUUazJKDFnl zpwud7mJcraPWtckbyZzrgoYr6LjoZZY48ivi2COyEBmBtKAIsyL6us4V/z80KVnOq3CCm GVEd68evX8Db6KR241tpDbTft3uQhdEANlP2nOdIhoC7WEYHeMug5ZjnKCTTDYXp7JJQoz gqj15+kFNt9T6vSAnsHeHImjAkZWs9lutiJOO3DZGX+wnk4lNK+j2vmABtBPmg== 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 4Wk0t16w5zzMwn; Tue, 13 Aug 2024 18:54:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DIsHV0088228; Tue, 13 Aug 2024 18:54:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DIsHpo088225; Tue, 13 Aug 2024 18:54:17 GMT (envelope-from git) Date: Tue, 13 Aug 2024 18:54:17 GMT Message-Id: <202408131854.47DIsHpo088225@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 372f92b8f59e - 2024Q3 - net/libiscsi: fix build on i386 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 372f92b8f59ee61d1f9b1bf0d1801b5b6d6fd276 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=372f92b8f59ee61d1f9b1bf0d1801b5b6d6fd276 commit 372f92b8f59ee61d1f9b1bf0d1801b5b6d6fd276 Author: Martin Birgmeier AuthorDate: 2024-08-13 18:31:59 +0000 Commit: Vladimir Druzenko CommitDate: 2024-08-13 18:42:18 +0000 net/libiscsi: fix build on i386 While here refresh patches with "make makepatch". PR: 280800 MFH: 2024Q3 (cherry picked from commit 2056579a4bfc05bf601d9d943a025da8fbb2552e) --- net/libiscsi/files/patch-configure.ac | 6 +++--- net/libiscsi/files/patch-lib_socket.c | 15 ++++++++++++--- net/libiscsi/files/patch-utils_iscsi-discard.c | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/net/libiscsi/files/patch-configure.ac b/net/libiscsi/files/patch-configure.ac index 38166307dcde..ddf9df4dee23 100644 --- a/net/libiscsi/files/patch-configure.ac +++ b/net/libiscsi/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- ./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 @@ +--- configure.ac.orig 2024-02-05 23:51:38 UTC ++++ configure.ac +@@ -170,7 +170,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #include diff --git a/net/libiscsi/files/patch-lib_socket.c b/net/libiscsi/files/patch-lib_socket.c index 8b00a0c73bf9..25ed1fdaece0 100644 --- a/net/libiscsi/files/patch-lib_socket.c +++ b/net/libiscsi/files/patch-lib_socket.c @@ -1,6 +1,6 @@ ---- ./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 @@ +--- lib/socket.c.orig 2024-02-05 23:51:38 UTC ++++ lib/socket.c +@@ -140,7 +140,7 @@ iscsi_add_to_outqueue(struct iscsi_context *iscsi, str pdu->next = NULL; } @@ -9,3 +9,12 @@ iface_rr--; } +@@ -531,7 +531,7 @@ iscsi_iovector_readv_writev(struct iscsi_context *iscs + + if (pos < iovector->offset) { + iscsi_set_error(iscsi, "%s: iovector reset. pos(%d) is smaller than" +- "current offset(%ld)", rw, pos, iovector->offset); ++ "current offset(%zd)", rw, pos, iovector->offset); + errno = EINVAL; + return -1; + } diff --git a/net/libiscsi/files/patch-utils_iscsi-discard.c b/net/libiscsi/files/patch-utils_iscsi-discard.c new file mode 100644 index 000000000000..d238f3e28c18 --- /dev/null +++ b/net/libiscsi/files/patch-utils_iscsi-discard.c @@ -0,0 +1,14 @@ +--- utils/iscsi-discard.c.orig 2024-02-05 23:51:38 UTC ++++ utils/iscsi-discard.c +@@ -220,7 +220,11 @@ int main(int argc, char *argv[]) + + capacity = block_length * (rc16->returned_lba + 1); + if (offset > capacity) { ++#ifdef __i386__ ++ fprintf(stderr,"Offset(%llu) exceeds capacity(%llu)\n", offset, capacity); ++#else + fprintf(stderr,"Offset(%lu) exceeds capacity(%lu)\n", offset, capacity); ++#endif + goto free_task; + } +