From nobody Mon May 13 11:03:53 2024 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 4VdGnj4WD5z5K16C; Mon, 13 May 2024 11:03:53 +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 4VdGnj1sBpz4n6J; Mon, 13 May 2024 11:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715598233; 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=JyuDg9THez2kNDZpjKcgZWJVyBlKpIU+EGZ20b+B2aE=; b=jdCykY6QMAdqlbh90ooGJAhDtV8WkgwzpEDfb0LpjC45hwwVFL6GNvoWJykI9Y57891m5G /M7rKtSwl59knVJwwZ00edQV/vazBbzmYfz1DHuB4+8R/CltunGU2NljpTzJ2WmGmcc+ps p4aryW+yly96NMWC3pHg4/WwdCXk+NUHPHhZ4o7zpFSErNdi4zdWAaGKW19ZMKI0M+XaP3 olTJ+xC36xPPBrew8yzCVqRes/KuWBUkFVhsl9Dm10zfnyGWW+Ed/RPb7cuhdntZ3sFdeY GQ4SqAm5FvCyhDUmH7ZgAp9zRgq2PA5LGwfVREWouCUHRWCLUjI1b6C4JYRB4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715598233; a=rsa-sha256; cv=none; b=qkPs1tCg23UtS3ezbo22s3C3Zy5s7naJqcmWUnUoSadXtw0vH48WJzfe3CJoFX/ZsefwK4 YhfBZz/gKfwR0wty2nWMtIL3FDLmXW6hPqEylGnj0XG+AY/+m44UROtlYOiHuPnVsr3Gd5 lx9BteWk8k5hgbk3Q/gmJ1Ofdvc2ec2Gocllloa3Y5pQuu1hfIsojRe20vEyqJZ9X/OpbG o/lnLJF/R0M6/mCrC3Tt6SmE5UuwNC02fH8m5mtqa4uaqdaf1ROrYE6uoWW+gzaReontfu 2T+zFTzckp7c67455jL6oiPoA3pa/czY1/68IBEu+r6Ocisy8KBnoGTtDxCK3w== 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=1715598233; 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=JyuDg9THez2kNDZpjKcgZWJVyBlKpIU+EGZ20b+B2aE=; b=p+RTW+ZZmGJvLhcN0OnaZU/xFu5VUisciA5P/wdIM4GD0vBLspD19cJuOhibKD0LGKifCR x7RcyjGQFj6rEctHDHxERRpfCNiL98vJeeUTWrNNGRmmVPZVLoIhsdwXpIr/I93Gx32jIn a2gpLbwi5QSBrnfr69hGfxgfLGyxMYyU+bDKnrR+cIoQmdwtc1Dx00vA2xGIT3HQ3a1Pz9 SvjRrVoBNjslxBKSsclO847h95EZfp07RTEcsYqqHCgUw1vK4WGFSOFUJe3oeMUcDW0woC W8T7f9IAty1tAh5waHHm5TtVK1nns0YHiERgZC9XSZI5X8WVpEtAqAWuCxAtCA== 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 4VdGnj1Sj0zlxD; Mon, 13 May 2024 11:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DB3rME060728; Mon, 13 May 2024 11:03:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DB3rk8060725; Mon, 13 May 2024 11:03:53 GMT (envelope-from git) Date: Mon, 13 May 2024 11:03:53 GMT Message-Id: <202405131103.44DB3rk8060725@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: 75cbd67d7179 - main - net/rosenpass: Fix build with rust 1.78.0 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 75cbd67d71793ebe3755a834af22afa244552d76 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=75cbd67d71793ebe3755a834af22afa244552d76 commit 75cbd67d71793ebe3755a834af22afa244552d76 Author: Mikael Urankar AuthorDate: 2024-05-07 10:51:48 +0000 Commit: Mikael Urankar CommitDate: 2024-05-13 11:03:21 +0000 net/rosenpass: Fix build with rust 1.78.0 PR: 278834 Approved by: portmgr (build fix blanket) --- net/rosenpass/files/patch-rust-1.78.0 | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/net/rosenpass/files/patch-rust-1.78.0 b/net/rosenpass/files/patch-rust-1.78.0 new file mode 100644 index 000000000000..efdfe6ac90b7 --- /dev/null +++ b/net/rosenpass/files/patch-rust-1.78.0 @@ -0,0 +1,32 @@ +Comment the "#[doc = !($field)]" line +Upstream has changed this code a lot and this line is not present anymore. + +error: attribute value must be a literal + --> rosenpass/src/msgs.rs:135:21 + | +135 | #[doc = !($field)] + | ^^^^^^^^^ +... +258 | / data_lense! { Envelope := +259 | | /// [MsgType] of this message +260 | | msg_type: 1, +261 | | /// Reserved for future use +... | +269 | | cookie: sodium::MAC_SIZE +270 | | } + | |_- in this macro invocation + | + = note: this error originates in the macro `data_lense` (in Nightly builds, run with -Z macro-backtrace for more info) + + +--- rosenpass/src/msgs.rs.orig 2024-05-07 11:12:55 UTC ++++ rosenpass/src/msgs.rs +@@ -132,7 +132,7 @@ macro_rules! data_lense( + impl<__ContainerType $(, $( $generic: LenseView ),+ )? > $type<__ContainerType $(, $( $generic ),+ )? >{ + $( + /// Size in bytes of the field ` +- #[doc = !($field)] ++ //#[doc = !($field)] + /// ` + pub const fn [< $field _len >]() -> usize{ + $len