From nobody Wed Apr 26 11:10:18 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 4Q5x3v12zJz47qSq; Wed, 26 Apr 2023 11:10:19 +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 4Q5x3v0T9Yz3mBS; Wed, 26 Apr 2023 11:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682507419; 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=zb6f4D39qaVCXBIKopkS5hNQaLltncv9xHnZybduOl8=; b=jXND0rod7hbk/pT3wAIJNMNIrhLA3t/IWTDO5nGuFWY4C8Xcu3lCEHNY2zPOiQfVOWrmPI HsS2Y4twi0T5BQzwyfXMVNZgtwdxhCVZQJ0+a6CyuBgsVgniimS9K+pMn6sPd0PsSqkgMz j0fRPTk8a7d4GRVFLjwKKXPfAPTSNwgwhEPDBV85OJBk36nn9WB8eK3MUoSDe39avI0Jmp UGGMNsLIawQ3eYCl9fIr8MCv0lPmOWahWB3JWFa/6JP7pZNJX6AMGtXshCFXMwOnaPl8gG K+/agmT7Y6lwP/+M5ov9TFMjZb0n+OuxgYXnup2LfT7l12QLgJMjFTm+uWA5Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682507419; 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=zb6f4D39qaVCXBIKopkS5hNQaLltncv9xHnZybduOl8=; b=AnMB8ay+UKm0BLAtXSHg4nGms/lwgebQEV14C8HMHdJepcFEeUAIbICRteQ686iqqzfWf5 /Q3G+hirsZ5DJz2jBAq4D/uZ8EejfVJSvy52LlgUOvtXAnz8Td458ryt2/XAn9bcFHbTcd HPjoPEBvaqDKvbmuV4ALbmAYX39n3bd7tebgb3dCARbSt/9iaDsP1g3dX5S9OOobhmN+p3 ZIQ9Gh0cokC8ltFJNfHJbDLNDqveGYM6gXnumUzm3d5xyPhPnP2x/KAi2ha+tCYFvWypCt QV/QQJGdd6Y9qdsT1YtS0q9pX2DXLWjjMtXG63+Q1BqAQGkpvthAXq7lAP7rfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682507419; a=rsa-sha256; cv=none; b=JsPICdAOz4CL+WaaF2bciDqXZPlTaGTnQxiwJwpxOQM+qKTfuo99yMRduzfy7B/THmC9Ap DrhpSwffV3zjJsamm1nhsS4e8CLEhX8QCtqnGnlMT3Oc/vX6OMedFuG5YVw1yxUMDY7B+z IFNeBRr5mCAJBJBCygOiZfIpBJLvaPrmI+0vjM7tYt/aqbT0HcLuNjMa7Qkso4XbAjojhW i87sqLS9sxuNKE2v7M9DfiMS3GQ4XCjTSyAmxYJ273I+c/0E4AvIb20uenI9witFvetRlw BvkUzdktF8PSjsC9GeNwmS2ZTgKpQ/+ApznNUUFYBcTkoB3wYcH0kJS4Czi2wg== 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 4Q5x3t6G4TzX5s; Wed, 26 Apr 2023 11:10:18 +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 33QBAIT1082692; Wed, 26 Apr 2023 11:10:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33QBAINs082691; Wed, 26 Apr 2023 11:10:18 GMT (envelope-from git) Date: Wed, 26 Apr 2023 11:10:18 GMT Message-Id: <202304261110.33QBAINs082691@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: eec16e488b05 - main - net-im/libsignal-node: Fix build with rust 1.69.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: 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eec16e488b05684cc15c25e63e0106b6d519b06b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=eec16e488b05684cc15c25e63e0106b6d519b06b commit eec16e488b05684cc15c25e63e0106b6d519b06b Author: Mikael Urankar AuthorDate: 2023-04-26 11:00:55 +0000 Commit: Mikael Urankar CommitDate: 2023-04-26 11:10:16 +0000 net-im/libsignal-node: Fix build with rust 1.69.0 Upstream PR: https://github.com/signalapp/libsignal/issues/519 Obtained from: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/signal-desktop/libsignal-fix-build-rust-1.69.patch --- net-im/libsignal-node/files/patch-rust-1.69.0 | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/net-im/libsignal-node/files/patch-rust-1.69.0 b/net-im/libsignal-node/files/patch-rust-1.69.0 new file mode 100644 index 000000000000..6bb5d3dbbbe2 --- /dev/null +++ b/net-im/libsignal-node/files/patch-rust-1.69.0 @@ -0,0 +1,47 @@ +PR: https://github.com/signalapp/libsignal/issues/519 +Obtained from: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/signal-desktop/libsignal-fix-build-rust-1.69.patch + +diff --git a/rust/attest/src/dcap/sgx_report_body.rs b/rust/attest/src/dcap/sgx_report_body.rs +index 056bef2b..6d3f0d5d 100644 +--- rust/attest/src/dcap/sgx_report_body.rs ++++ rust/attest/src/dcap/sgx_report_body.rs +@@ -20,7 +20,7 @@ const SGX_HASH_SIZE: usize = 32; + + pub type MREnclave = [u8; SGX_HASH_SIZE]; + +-#[derive(Debug)] ++#[derive(Copy, Clone, Debug)] + #[repr(C, packed)] + // sgx_report_body_t + pub(crate) struct SgxReportBody { +diff --git a/rust/attest/src/endian.rs b/rust/attest/src/endian.rs +index ae9351eb..2e08c711 100644 +--- rust/attest/src/endian.rs ++++ rust/attest/src/endian.rs +@@ -7,7 +7,7 @@ use std::convert::{TryFrom, TryInto}; + + use hex::FromHex; + +-#[derive(Debug)] ++#[derive(Copy, Clone, Debug)] + #[repr(C, packed)] + pub(crate) struct UInt16LE { + bytes: [u8; 2], +@@ -27,7 +27,7 @@ impl From for UInt16LE { + } + } + +-#[derive(Debug)] ++#[derive(Copy, Clone, Debug)] + #[repr(C, packed)] + pub(crate) struct UInt32LE { + bytes: [u8; 4], +@@ -66,7 +66,7 @@ impl FromHex for UInt32LE { + } + } + +-#[derive(Debug)] ++#[derive(Copy, Clone, Debug)] + #[repr(C, packed)] + pub(crate) struct UInt64LE { + bytes: [u8; 8],