From nobody Tue Aug 13 18:36:44 2024 X-Original-To: dev-commits-ports-all@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 4Wk0Tm6xFkz5TBnq; Tue, 13 Aug 2024 18:36:44 +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 4Wk0Tm6Gqlz4m1k; Tue, 13 Aug 2024 18:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723574204; 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=5onHXppGeUCsPqjTFpKQI9nszM7K/DjN5fSt1WB+uhc=; b=quI2HzrcYGnrN9NdL7apLfYLbu6w/vCEZ+h8bfuTo14I0Gm6s29of3BlHghd52CRCOG4ow IZ6gUno0+eXvEymL7mpTWwgcKEKiUbs7YOpqErh6TibOPn01nJ8BDhETp28VUbVAAoFc60 nAiOr+PrybETOHG20EAbBJuMTDcWohf5+MmyhsySGFvVLji+khNL3XBtgqBHXtj12p9Bw8 kDSIZj5rV9YpyC9iJh1EFRFoI+In7QlRDn/jK0gtQq7IkS3uexDAp91MB+ykLr3eGgs/a6 ZRZuqzcfYw//5PDrIDXYb5gIPOFEfKLBPefvx3HN5ziNoNIzgIYKDXKAe1e0ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723574204; a=rsa-sha256; cv=none; b=eFE1n//hxil2pHUNDaQOkrlNuTTHL1MHoyIzGVfIROHEmSzZ7qNad662SHgrZGxNWLm7YE TTROR8MOs67rZ0+6KC9TvFSZE/tNrvg+zlVWbOGdsPatU/l7p8OI5yynG+NkFsTMPtEQIt VqNHUSAF8rNwYo6XLqojQ/iJxONOpowFhTyPbLR+8ZeEknoJ3MBYuUl296Wl1sjAxXx9rN 1Dd+jujSNfuKSXvlNBwj3RIz8YhPTQkm9RhOlTh+Srqb6IwkmjLWXMSeRjpaqtpybgajmE VTGnuncO4TPbR+7Pm2wCez2OtuvqIPmIDAhv2/gShNkHjBtUuB5TSjDUpADkew== 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=1723574204; 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=5onHXppGeUCsPqjTFpKQI9nszM7K/DjN5fSt1WB+uhc=; b=ePiqJJL5/5NKZ2kRzJzxtREcOiPQf+6jUEtYWw26lcrh3H3AVZaLAdUr3Akc2IAyaIci+f i/GxAi3PpOUfnDoKeHdF560qco95Wp6q8R9l5MXYjnPThhiZj993dfg1JanwiQLvCF/ikV Mchor2oaRMZfnml4Ihn1nyrUTHEMQriTXbBDI2iZ5tYJUwB0HVX0nejXN7hn9VBRUgiKAu ZeCDrf9oG8SoWCbPuJUcEAtBI3lpU+5kFoZvHAHwUhT2uO8Je/OgBwTt5YPcZIMuSbYGVn 9ph7wX/a5h6CcvUO9hQ6XLsxTDoFT65OZedo/AAtjnh7zwkiIBpsY93x8EHo0w== 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 4Wk0Tm5RnjzMqc; Tue, 13 Aug 2024 18:36:44 +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 47DIai0R055464; Tue, 13 Aug 2024 18:36:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DIaidv055461; Tue, 13 Aug 2024 18:36:44 GMT (envelope-from git) Date: Tue, 13 Aug 2024 18:36:44 GMT Message-Id: <202408131836.47DIaidv055461@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 2056579a4bfc - main - net/libiscsi: fix build on i386 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 2056579a4bfc05bf601d9d943a025da8fbb2552e Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2056579a4bfc05bf601d9d943a025da8fbb2552e commit 2056579a4bfc05bf601d9d943a025da8fbb2552e Author: Martin Birgmeier AuthorDate: 2024-08-13 18:31:59 +0000 Commit: Vladimir Druzenko CommitDate: 2024-08-13 18:31:59 +0000 net/libiscsi: fix build on i386 While here refresh patches with "make makepatch". PR: 280800 MFH: 2024Q3 --- 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; + } +