From nobody Mon Jan 20 11:07:25 2025 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 4Yc6xT5lBmz5lCJW; Mon, 20 Jan 2025 11:07:25 +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 4Yc6xT4B9bz3mrX; Mon, 20 Jan 2025 11:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737371245; 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=lAUTWBsG4D3yosVf7lSyU8fwOObGI9gm9J6q1VkFPZc=; b=hzcuz/NUFg+D8qssDZaiddmftLT0XJ9yV4cnqPTnE9XuCMGH/PN2ygjLXpREvYqPCCgqPG eC+bwIr03guS9ShjdJGV9iygBcsewHthGOdgUTfpuKx3YwkoacGSiLboD9q7lPAdo9Ngyt Ot7S0P9foAWwLQhj+q4szchEQDO5KHB3hn3X5/+68kBW/W21l6WYuLwtDwTAGDJgnUVp4B j/fEeYrp/bG6FnlFxtoq8ZePypNc9G5lx56pB+JsOKtOWM+RpjSdtBiC2pZ3KqE7T8pJsy +mwLVuwiK6HRCoI+uD7Fke+BmqBMoOnDy/wb0qaYkshOi4sbyIOp4NcnfLIamQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737371245; 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=lAUTWBsG4D3yosVf7lSyU8fwOObGI9gm9J6q1VkFPZc=; b=xhpxGWZ6zm7h117/mImz+GdPSPXldWEyeC6207N2xCrvlYVXPHaKhHY0OaixHexLfv2csU OGSsZjXCPjNE3fvq8NYJRFm0QoHBrMjiOCStkVPNn0Gxs7hD9GPcOobXPgGfXDx93AVo76 ZvwbAl/CqbeYuSpKaWQKQcbQJlgZrm2ZZJlYtBBXjmGpoIMYqjHv3T/Gh1ee9BR8NWH3R+ Xi9YAo7kj9vOXyIH0sfkZVZrLihuODII7baxgVnNMcB5RVElEjqHDuL1CGG75ZGVAxjfLm lUQOjuEYl2xbofaIDMmTZLKEl4VN6vYvbpW5Z4Esy0/ddFCZz1Vzhw51/aydqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737371245; a=rsa-sha256; cv=none; b=w8giiRX5ZG1BQdNuOL3Ujf7LczALVCQvxQloC2kH+hkhMmBJVWruQXUouX6ecWLYhv3MOB 6u0+QzKCA160KtQp7pzYcpzUmshbyiFzA+eXYZSn/uTDMqVh5wRNOcAnIO8MR6LOqF11eo cIcg1o/CCNu+p8zyMjpn+cwFZxFl5oqOhy/eC7PQnN9cW7E+dd1l40RP+fMAhAoQUWRngO Pp7N+78gyM+zj6pmxlWJnra/K33h6wQwJ+LLF5/7cQ5MmtwiDcZciyWFljKfN63zeML6wP pWlgDEOY1gUPCf/YTV+4DvS+/1knh2G1WvfG30zUw1uPENvc3FIpGFdWfQ6xOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yc6xT3dNcz2sj; Mon, 20 Jan 2025 11:07:25 +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 50KB7P0A014840; Mon, 20 Jan 2025 11:07:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50KB7PP3014837; Mon, 20 Jan 2025 11:07:25 GMT (envelope-from git) Date: Mon, 20 Jan 2025 11:07:25 GMT Message-Id: <202501201107.50KB7PP3014837@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 51c1d2b650ff - main - security/vaultwarden: Fix build with rust 1.84.0 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51c1d2b650ff4ca6e3ac66d7badadf0a1f57973f Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=51c1d2b650ff4ca6e3ac66d7badadf0a1f57973f commit 51c1d2b650ff4ca6e3ac66d7badadf0a1f57973f Author: Mikael Urankar AuthorDate: 2025-01-16 09:12:14 +0000 Commit: Mikael Urankar CommitDate: 2025-01-20 11:05:45 +0000 security/vaultwarden: Fix build with rust 1.84.0 Import upstream patch [1] [1] https://github.com/dani-garcia/vaultwarden/commit/10d12676cf11566ea33f49bbdc207bc417be7225 PR: 283962 --- security/vaultwarden/files/patch-rust-1.84.0 | 57 ++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/security/vaultwarden/files/patch-rust-1.84.0 b/security/vaultwarden/files/patch-rust-1.84.0 new file mode 100644 index 000000000000..dd432e878e90 --- /dev/null +++ b/security/vaultwarden/files/patch-rust-1.84.0 @@ -0,0 +1,57 @@ +https://github.com/dani-garcia/vaultwarden/pull/5371 +https://github.com/dani-garcia/vaultwarden/commit/10d12676cf11566ea33f49bbdc207bc417be7225 + +From 10d12676cf11566ea33f49bbdc207bc417be7225 Mon Sep 17 00:00:00 2001 +From: Mathijs van Veluw +Date: Thu, 9 Jan 2025 12:33:02 +0100 +Subject: [PATCH] Allow building with Rust v1.84.0 or newer (#5371) + +--- + Cargo.toml | 4 ++++ + src/api/notifications.rs | 4 +++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index a5c320d8e0..547de58e3a 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -230,6 +230,10 @@ unused_import_braces = "deny" + unused_lifetimes = "deny" + unused_qualifications = "deny" + variant_size_differences = "deny" ++# Allow the following lints since these cause issues with Rust v1.84.0 or newer ++# Building Vaultwarden with Rust v1.85.0 and edition 2024 also works without issues ++if_let_rescope = "allow" ++tail_expr_drop_order = "allow" + + # https://rust-lang.github.io/rust-clippy/stable/index.html + [lints.clippy] +diff --git a/src/api/notifications.rs b/src/api/notifications.rs +index 8c925e37bb..9a53b95ffc 100644 +--- a/src/api/notifications.rs ++++ b/src/api/notifications.rs +@@ -101,6 +101,7 @@ impl Drop for WSAnonymousEntryMapGuard { + } + } + ++#[allow(tail_expr_drop_order)] + #[get("/hub?")] + fn websockets_hub<'r>( + ws: WebSocket, +@@ -186,6 +187,7 @@ fn websockets_hub<'r>( + }) + } + ++#[allow(tail_expr_drop_order)] + #[get("/anonymous-hub?")] + fn anonymous_websockets_hub<'r>(ws: WebSocket, token: String, ip: ClientIp) -> Result { + let addr = ip.ip; +@@ -290,7 +292,7 @@ fn serialize(val: Value) -> Vec { + fn serialize_date(date: NaiveDateTime) -> Value { + let seconds: i64 = date.and_utc().timestamp(); + let nanos: i64 = date.and_utc().timestamp_subsec_nanos().into(); +- let timestamp = nanos << 34 | seconds; ++ let timestamp = (nanos << 34) | seconds; + + let bs = timestamp.to_be_bytes(); +