From nobody Thu Feb 2 13:46:06 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 4P70Rz28Tvz3dMbp; Thu, 2 Feb 2023 13:46:07 +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 4P70Rz0yYBz4PMb; Thu, 2 Feb 2023 13:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675345567; 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=nE1JCRVR9NqBDWywHqEICheInWUDwwhr70C67Dlo/nE=; b=LW81XFuSaMuK1z3UoqR6y3LyrGs4Lau/Gdr9yPur6TZf8nK9wImV+YmZBP7gavlYXg3iKE yPh5oXfmskz6pSewU8CZViFLqp5jW59F6WamYvqbVqZbQ5WcDmXBwKbxXUITcFP26fg/Kt 5oKo21hqUVUVhv/6PV0X8QH/grw+7G5c2E8QrADmIawoDENfZQtpckXm6HemYtvhSmJImg qtnbHosgSkodt55EYx35ZMucESioNv2N3NgIvbxS6bw8PKYixJfat2XSKVYrKJJ6ctLUjF OzIFm5zAgZGjklm7peNHhkGHMEWngqDNhpmGI371wfxTSNn2dGSc2bpPbqi6iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675345567; 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=nE1JCRVR9NqBDWywHqEICheInWUDwwhr70C67Dlo/nE=; b=uBmr4k9KM7CvBLSe7fgPFjphTxczBpw0Zh8O+hvzK7TxGYh2gC2ptATQcm7ldaJ9GKfQKD xj3SnCNyMhWzB4IcCqdwnNHfh6AQIVnohdUNtFxt9sgBNg+W7RzaNzLxZjKrinLr6mh5TY uMpbCFB9swX2jzZNI/t3SWZKk+u/nCbiU4XVh5xwauf0MUsSK7iJVWVTGR0vDNhmDMYuox T+8R1MVTFnBVNDxo4MZNyAAvR4J8D7vd3IDqyzsSUNDEawANzQVCrzC8r8WXGrRnmhtE+3 VIvlwRe8DvElhGeMcfLUWREAXralPXq7jGPMREnSCbRadHSRSBgLcza7zJY8Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675345567; a=rsa-sha256; cv=none; b=VhtiN0mALhxGI4GxStHoDaybrnS3g8ICRVHcHNq8+VgY3t4DoZjGeLhvhYYfRLRVaUI32D 9NQrVfX0KioctOTJ0j07IeiRLqtEOPE49uk5aip41KwEqIQsyAgwW6HzUk4S7BOcl3O3mE JExiS2/CL3UnmI4qnCWlTqdy9MQ2KZsZX325PjhJgkg4O2D+jKs4cQCxiFD1w7H04nqu+C ckB2mm8izZs9I+6KTS6Avn2VTX3Eg32k8IbAdyooxg+JyvcnV/pK/cPGt3k4tipCvuEh3+ oPOj2a99moma8D6sLZr89ZCSdA8uYNwmepwlQuDZz6PiMRFRefVHxBlr9dcUCw== 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 4P70Rz0415zwS0; Thu, 2 Feb 2023 13:46:07 +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 312Dk606090936; Thu, 2 Feb 2023 13:46:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312Dk61M090935; Thu, 2 Feb 2023 13:46:06 GMT (envelope-from git) Date: Thu, 2 Feb 2023 13:46:06 GMT Message-Id: <202302021346.312Dk61M090935@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 91c0d1c49f9f - main - sysutils/fselect: add upstream commit that fixes armv7 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91c0d1c49f9f31c2122aca54b822535f0f94c630 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=91c0d1c49f9f31c2122aca54b822535f0f94c630 commit 91c0d1c49f9f31c2122aca54b822535f0f94c630 Author: Piotr Kubaj AuthorDate: 2023-02-02 13:46:04 +0000 Commit: Piotr Kubaj CommitDate: 2023-02-02 13:46:04 +0000 sysutils/fselect: add upstream commit that fixes armv7 It also fixes build on powerpc. --- ...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.