From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id QFOSAiMORmc3QAAAe85BDQ:P1 (envelope-from ) for ; Tue, 26 Nov 2024 18:06:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id QFOSAiMORmc3QAAAe85BDQ (envelope-from ) for ; Tue, 26 Nov 2024 19:06:27 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RZkCoC0c; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=NbtFOwGW; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732644386; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=PP9Yj8CkdA9H03aL7hcrZPK2D2oxjvnZvS4nhrPgYlU=; b=eZgQpzGlZ8RpmkpKdIBlCGOq3LPggoLbFSFRfrOE4jLr4RgOjBN4QEFUtn1dSTJ3FCckYY 16kiXyvgnGnJo8VwyyEzGgNeNcBwrWLwE6IaQE53aFa0UqpvPV9E3GbY51wFY+ZhXimRVX iZRcbKRp2M1bGwHH0Y++BiVxLB3jRsm04dbE2QiIogU28MDEF884zI9AwsfAmwEO2ay17L IEaUPzB4ky+lK7Y/aeNdvdL5nxU7sgUdGavQvcsaRj+uxKu/w6xhhMNGHs9QIEqddUvOzd 9tfbrQiDK8ggJ+NtDwH/QP5lENwjnWrofAlWKzEclUfG+qFwyB6ivAYrKD0KnQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RZkCoC0c; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=NbtFOwGW; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732644386; a=rsa-sha256; cv=none; b=NxjGdZ0+YlIMZfXPLL94zNGxfEezxXRcPrBegiajmZiWis5lJrAxkp4+KxFhtbtYADkv6j oQ9KzJIEeyNuhB+cBjkxbQAc+HLJNaHIIhG7g6+EcWAzi4YmsREWwQQvRP4GGKDDE9ZYfO 8WNWzDUSixu04UT+0inI6maOpC531mEMiT1U3iGtjCXWprMmq5xzgzn+fjSkbTkc8WAPVR erd8ef+DxRznPmKKb4d7NWWbpyURxfQUzgQmBnbv44b6yFuSm4JiLyf25pyBORBsYm1ny9 zQ3AeQwqmB3JzHVhF5zS23Toed0n3bqtsr6/Ezg6JyM01zPn3Ua0/AA0QpKaKw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 023338FADB for ; Tue, 26 Nov 2024 19:06:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tFzwt-0001EK-D5; Tue, 26 Nov 2024 13:06:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tFzwo-0001DU-7D for guix-patches@gnu.org; Tue, 26 Nov 2024 13:06:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tFzwn-0006pL-Qq for guix-patches@gnu.org; Tue, 26 Nov 2024 13:06:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=PP9Yj8CkdA9H03aL7hcrZPK2D2oxjvnZvS4nhrPgYlU=; b=RZkCoC0c9eEVqnzVj2SLVYbbpaRM9bl33vpUEuxmYRBlLhJ+aCwg9uaSWS9dyNqXqj3+N8q4ECciKFT888Hq7gIb6mchS+KlSD76mE7GfmqL2F2SIbzGgLx+lQ5QmBS6qSxUpr8AqCGWx+MlchPCMf101y+EZY42VC7ejArxzZemECZqZ+nZ4LoSn2GM48elavcBHb79pW8bx1qTKujt+X2imPVbd6eeMDp5b4hgVsHzwTC6BZ5A244imCgtti7NTw3ShiUYA8Ba7WkOG54u2wdLBLoaUHuM/EOxolOcJGK/bCycUYFwLMiH2SRMKxmfIamTz6k3Ub1EdVE1oc651Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tFzwn-0007wS-Kh for guix-patches@gnu.org; Tue, 26 Nov 2024 13:06:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74546] [PATCH 1/3] gnu: ucx: Update to 1.17.0. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Nov 2024 18:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74546 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74546@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74546-submit@debbugs.gnu.org id=B74546.173264433430430 (code B ref 74546); Tue, 26 Nov 2024 18:06:01 +0000 Received: (at 74546) by debbugs.gnu.org; 26 Nov 2024 18:05:34 +0000 Received: from localhost ([127.0.0.1]:52145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFzwL-0007ui-IN for submit@debbugs.gnu.org; Tue, 26 Nov 2024 13:05:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFzwK-0007uM-1Z for 74546@debbugs.gnu.org; Tue, 26 Nov 2024 13:05:32 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tFzwD-0006dF-Qp; Tue, 26 Nov 2024 13:05:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=PP9Yj8CkdA9H03aL7hcrZPK2D2oxjvnZvS4nhrPgYlU=; b=NbtFOwGWipgLfzXPSdSm cNbCH7F5ARIuhWKr/2J4ywrseZTVT+PbQYWHaDkxHQP8jTuL8JmJmPiJEzSUr8KlfTnNZtTCIr/ST tODGSJO6yiVSAOLq8EYmPv/oZKbrzN0LphF76lKcpmXgFhJjQ1qNAsWDCHV5GCpeF9DynGFgmfg2R lovuXhaBDnFwRLsF+fIQtUmMm7EbxQPuxIwdPQufnqynaUe8h9vabWW6xW1MxbqHp0UCwsNUVpeTV qULUiuaBcWupV3PsP4k81vLI130J/1bQhA/Az4Q4TSG33UE5/ZBO+lZ903HUarOXurXvRWXq5KW3J ijKAEud1OYS5PQ==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 26 Nov 2024 19:05:00 +0100 Message-ID: <5c2c0bc8b674b3ef9aaf59e8ef50b14725525042.1732643955.git.ludo@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -0.84 X-Spam-Score: -0.84 X-Migadu-Queue-Id: 023338FADB X-TUID: F7Sg8cCLbHLQ From: Ludovic Courtès * gnu/packages/fabric-management.scm (ucx): Update to 1.17.0. * gnu/packages/patches/ucx-tcp-iface-ioctl.patch: Rebase. Change-Id: I2089de93da88f4f81c4b233eb03abae1f41dfe7f --- gnu/packages/fabric-management.scm | 4 ++-- .../patches/ucx-tcp-iface-ioctl.patch | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index 7e539406db..6bf0387cef 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -185,7 +185,7 @@ (define-public ibutils (define-public ucx (package (name "ucx") - (version "1.15.0") + (version "1.17.0") (source (origin (method git-fetch) (uri (git-reference @@ -195,7 +195,7 @@ (define-public ucx (patches (search-patches "ucx-tcp-iface-ioctl.patch")) (sha256 (base32 - "1mk46vyfp8hsivk88s8gv0nf458jfs59fczpf66wwa3a9yp324jp")))) + "09182kx60kq7iyjyz3mpcrgp1mm0lnpc0f4hd4hlw5yyabkxrpa1")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/patches/ucx-tcp-iface-ioctl.patch b/gnu/packages/patches/ucx-tcp-iface-ioctl.patch index 2a0e4ce138..49038b90f6 100644 --- a/gnu/packages/patches/ucx-tcp-iface-ioctl.patch +++ b/gnu/packages/patches/ucx-tcp-iface-ioctl.patch @@ -6,7 +6,7 @@ names of the available TCP network interfaces. Initially submitted at . diff --git a/src/uct/tcp/tcp_iface.c b/src/uct/tcp/tcp_iface.c -index 6a6cd34fa..af32bb2e9 100644 +index f90d54fef..a2f74dc32 100644 --- a/src/uct/tcp/tcp_iface.c +++ b/src/uct/tcp/tcp_iface.c @@ -18,6 +18,8 @@ @@ -18,9 +18,9 @@ index 6a6cd34fa..af32bb2e9 100644 #define UCT_TCP_IFACE_NETDEV_DIR "/sys/class/net" -@@ -875,6 +877,85 @@ static UCS_CLASS_DEFINE_NEW_FUNC(uct_tcp_iface_t, uct_iface_t, uct_md_h, - uct_worker_h, const uct_iface_params_t*, - const uct_iface_config_t*); +@@ -873,6 +875,85 @@ static int uct_tcp_is_bridge(const char *if_name) + return (stat(path, &st) == 0) && S_ISDIR(st.st_mode); + } +/* Fetch information about available network devices through an ioctl. */ +static ucs_status_t uct_tcp_query_devices_ioctl(uct_md_h md, @@ -104,11 +104,11 @@ index 6a6cd34fa..af32bb2e9 100644 ucs_status_t uct_tcp_query_devices(uct_md_h md, uct_tl_device_resource_t **devices_p, unsigned *num_devices_p) -@@ -893,9 +974,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, +@@ -890,9 +971,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, - dir = opendir(UCT_TCP_IFACE_NETDEV_DIR); - if (dir == NULL) { -- ucs_error("opendir(%s) failed: %m", UCT_TCP_IFACE_NETDEV_DIR); + n = scandir(UCT_TCP_IFACE_NETDEV_DIR, &entries, NULL, alphasort); + if (n == -1) { +- ucs_error("scandir(%s) failed: %m", UCT_TCP_IFACE_NETDEV_DIR); - status = UCS_ERR_IO_ERROR; - goto out; + /* When /sys is unavailable, as can be the case in a container, @@ -117,10 +117,10 @@ index 6a6cd34fa..af32bb2e9 100644 } devices = NULL; -@@ -963,7 +1044,6 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, +@@ -959,7 +1040,6 @@ out_release: + } - out_closedir: - closedir(dir); + free(entries); -out: return status; } -- 2.46.0