From nobody Thu Feb 2 13:49:30 2023 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 4P70Wv0Znyz3dNDy; Thu, 2 Feb 2023 13:49:31 +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 4P70Wv068Kz4Q82; Thu, 2 Feb 2023 13:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675345771; 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=Vn6XBoqhPkCbBIx+S9iNjOXYnDsgGqSXbWIRuw1CQUc=; b=yEnUtCklW9J8o6cfMEIbI9oFd63D8huWG9lGSp4TTqsvLdJ6cy+n72XdNegxw05zTUa+2B 1GM7tz12ZFctXWWu5lKd801gOETtIi0r5JdKn/451bAIkbFsLj0+lCeVtJrjQCAK0TL75Y u/a1tEopi0iKnWyfgkxmw70mKBERHbbR8EoNmfbgtEu0JZjdIrMg7NQehacCAqruizqMXG BQP5FSDLurbN94h4nMmbn2PzwIgCkvNCe7hKEPqTAQ6AGvcdQSAOgebpYUVoqFuVE5gNu8 z1djLxPflxOoVBqH8RIEdVU3xfxafq7E8FiNBliqpLmGLSiqdhxvnT1JIPSXyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675345771; 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=Vn6XBoqhPkCbBIx+S9iNjOXYnDsgGqSXbWIRuw1CQUc=; b=BFzmEeb1EY00kUE0r86+Zq2jurMh7bejkeqz1vFzYrXXgU0zaJCUKhEmdzNQfKRf+cwr/e MM+DQbtEmqZOZHNLDeApDojSbFdIO/bSjbYXVM/yxnZL2rL6ey1eVsN9t0/tsOXUgWkZf1 evBqqqDLttmxZi7FlaAIV9nLEJhrOym1UpPy04eBCne/nt39YSQvBCa7vo1+4ULnn9uX8j Cgv2YZFSX6RyS2kvvQKNHkeDHyWqWfQbKoOZjPjJnwrZcqSFkvaBEhxZS3g4CHg4AzCugl HPOCHMcYdNFrHtEjfknEmIeQz22FHXZ4mgZeWnl3WxaCusMIR+WQ+IbGtiBxrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675345771; a=rsa-sha256; cv=none; b=KllOrnjDHLjNOcwb1Jdj08NKk5JziHfSPi3tQgOMU9AQzL2FYjFH3dpeiPScuKF8gbds9g zdVSguLNSrObIYTXptqmXnpD58vzHcWMcvyjd8nhx6IGrTsT+wrrTD+y6EYdbu13MnwlII Pdel6aZOW7vD9rtklKxoKjnsAwT/6WsNatWOqMgNiKiDXOpz97dajNdB+xh8DMQuK5BdlX O5rmZ5gMUfIQbGnEb85Wi+CPKsDkyFyERkHAoDjsoOo09JWatDjtUpl45qW7YbQmAKGN2G TcfUg4oqpUGeHDsI6BENEnohFZjMHZBL1dwIisPOYr6dMtHVTTgmL02W+lNh/w== 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 4P70Wt5typzwbJ; Thu, 2 Feb 2023 13:49:30 +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 312DnUA3091800; Thu, 2 Feb 2023 13:49:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312DnU0t091799; Thu, 2 Feb 2023 13:49:30 GMT (envelope-from git) Date: Thu, 2 Feb 2023 13:49:30 GMT Message-Id: <202302021349.312DnU0t091799@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Piotr Kubaj Subject: git: 42403ff18b87 - 2023Q1 - sysutils/fselect: add upstream commit that fixes armv7 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 42403ff18b87182275590236e57ca7e0f990d492 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=42403ff18b87182275590236e57ca7e0f990d492 commit 42403ff18b87182275590236e57ca7e0f990d492 Author: Piotr Kubaj AuthorDate: 2023-02-02 13:46:04 +0000 Commit: Piotr Kubaj CommitDate: 2023-02-02 13:48:35 +0000 sysutils/fselect: add upstream commit that fixes armv7 It also fixes build on powerpc. (cherry picked from commit 91c0d1c49f9f31c2122aca54b822535f0f94c630) --- ...crates_rustix-0.34.6_src_imp_libc_net_syscalls.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sysutils/fselect/files/patch-cargo-crates_rustix-0.34.6_src_imp_libc_net_syscalls.rs b/sysutils/fselect/files/patch-cargo-crates_rustix-0.34.6_src_imp_libc_net_syscalls.rs new file mode 100644 index 000000000000..b15774f12d70 --- /dev/null +++ b/sysutils/fselect/files/patch-cargo-crates_rustix-0.34.6_src_imp_libc_net_syscalls.rs @@ -0,0 +1,20 @@ +--- cargo-crates/rustix-0.34.6/src/imp/libc/net/syscalls.rs.orig 2023-02-02 13:18:53 UTC ++++ cargo-crates/rustix-0.34.6/src/imp/libc/net/syscalls.rs +@@ -548,11 +548,12 @@ pub(crate) mod sockopt { + return Err(io::Error::INVAL); + } + +- let tv_sec = timeout.as_secs().try_into(); +- #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))] +- let tv_sec = tv_sec.unwrap_or(c::c_long::MAX); +- #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] +- let tv_sec = tv_sec.unwrap_or(i64::MAX); ++ // Rust's musl libc bindings deprecated `time_t` while they ++ // transition to 64-bit `time_t`. What we want here is just ++ // "whatever type `timeval`'s `tv_sec` is", so we're ok using ++ // the deprecated type. ++ #[allow(deprecated)] ++ let tv_sec = timeout.as_secs().try_into().unwrap_or(c::time_t::MAX); + + // `subsec_micros` rounds down, so we use `subsec_nanos` and + // manually round up.