From nobody Sat Apr 02 20:43:06 2022 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 0A5B21A4BFFE; Sat, 2 Apr 2022 20:43: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 4KW8BL4R40z3DKL; Sat, 2 Apr 2022 20:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648932186; 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=35iiuZsoCpMadHY2rXm6QF0qs8qFn0Mp3Hg+07Nynm4=; b=jpthagrdVJUwJs2pFOV7BekAC3BMj0E7jqBiz27pf3iMFRalzF8GeaaIOTcoLau6MljJn0 hapNtD4VDpvOjZj49NfTMhX0KebVSNr5fEZYyJzOcNjQJ0PlAwk1xPVeBf42y4oynviwT5 nXpYixH8LsvIPSmu6TofXlf8/FlPP1DCkNmIW+60GTpDvf0++J6OmIPhSOeG3Dx2X7tShH FQNWkN/0owtplYOg9CpUy1RrWY16ieSe+hSwZ7e7SG5I8JLaaP/GRggYV36iZOeya08991 O+GDhyzxttORPz4jGTW4BtAjUj959wdQWELJdDth/5r5Oa2h2QZHZAaKJ85+ig== 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 72E4010600; Sat, 2 Apr 2022 20:43:06 +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 232Kh6lS085420; Sat, 2 Apr 2022 20:43:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 232Kh6S4085419; Sat, 2 Apr 2022 20:43:06 GMT (envelope-from git) Date: Sat, 2 Apr 2022 20:43:06 GMT Message-Id: <202204022043.232Kh6S4085419@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: d34590035d66 - main - security/weggli: fix build on powerpc 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: d34590035d66eb10742d3b338b928e5c7c460823 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648932186; 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=35iiuZsoCpMadHY2rXm6QF0qs8qFn0Mp3Hg+07Nynm4=; b=GhEJZZ/Gn0CbZP1JxAXAE76i83G3TvgA4GL/pGSqaZdH0ISuem1HS3uZdiBTkk3Y1ZaTNk 7cEIEi3eoeii+UnzVGLbgtzvjOiY86GkzMWzDKKOjam9Ko4pmU3I+DcfZ9UeUQnjsh1SLY c4smqgrn0g+AofS+7XkV8BouThrbVeHpEWeZfiaSopv8xEgRUkR2rRyJzOcpcIqkSU3qjc HxqXPblKHlqPZZCqxECfI1ebWG15GmDdHzhpFT6VZp+qQ25OsOtVKKO66ClbX5Tg2z/+rF vUsJnhjR9tMXHShT3tUiuoyEhanvHEeOG4+0zQ7TtuWPklSfmIfyrQXrOFy+8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648932186; a=rsa-sha256; cv=none; b=C2/Zs1NazjuHOKHrzjtkC3yXKVz3ylIixTb/2EdDrkOLztnNdp4w6826moniyzkSu7HOjj loAjfwQpKicoaNbGefn8g0Bfan+vNoGV2ZiceoXN/fPT84IgwyTA2U8kD+66T12rfjx853 Q4B1U9pL67aZib2NZj1IH0zMYLLwY73LFprozmPZ78n4lry5x48BOVysqU/d/A+MF+pMGA 93EpAzJis7UAsp4Lntmi158l5Or1rE5rHSC9iPlhCDNRPPzJUzqL+qJlUfQNGtXj/f75S5 VDpL9GZewtUH505OM1fRDGpQhWhwAArxo5nAuHKK8fsaDkl8OZPcvkiLTzYk7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=d34590035d66eb10742d3b338b928e5c7c460823 commit d34590035d66eb10742d3b338b928e5c7c460823 Author: Piotr Kubaj AuthorDate: 2022-04-02 20:31:16 +0000 Commit: Piotr Kubaj CommitDate: 2022-04-02 20:31:16 +0000 security/weggli: fix build on powerpc libc patch is upstreamed, but crossbeam-{epoch,utils} is used in older version that requires patching. --- security/weggli/files/patch-powerpc | 70 +++++++++++-------------------------- 1 file changed, 20 insertions(+), 50 deletions(-) diff --git a/security/weggli/files/patch-powerpc b/security/weggli/files/patch-powerpc index 819f907bb705..0f536b57abf4 100644 --- a/security/weggli/files/patch-powerpc +++ b/security/weggli/files/patch-powerpc @@ -1,50 +1,20 @@ ---- cargo-crates/libc-0.2.107/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig 2021-06-23 22:40:24 UTC -+++ cargo-crates/libc-0.2.107/src/unix/bsd/freebsdlike/freebsd/powerpc.rs -@@ -0,0 +1,47 @@ -+pub type c_char = u8; -+pub type c_long = i32; -+pub type c_ulong = u32; -+pub type wchar_t = i32; -+pub type time_t = i64; -+pub type suseconds_t = i32; -+pub type register_t = i32; -+ -+s! { -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: u32, -+ pub st_lspare: i32, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ } -+} -+ -+// should be pub(crate), but that requires Rust 1.18.0 -+cfg_if! { -+ if #[cfg(libc_const_size_of)] { -+ #[doc(hidden)] -+ pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1; -+ } else { -+ #[doc(hidden)] -+ pub const _ALIGNBYTES: usize = 4 - 1; -+ } -+} -+ -+pub const MAP_32BIT: ::c_int = 0x00080000; -+pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4 +--- cargo-crates/crossbeam-epoch-0.9.5/no_atomic.rs.orig 2021-07-12 16:01:21.814570000 +0200 ++++ cargo-crates/crossbeam-epoch-0.9.5/no_atomic.rs 2021-07-12 16:01:34.083879000 +0200 +@@ -30,6 +30,7 @@ + "mipsel-unknown-none", + "mipsisa32r6-unknown-linux-gnu", + "mipsisa32r6el-unknown-linux-gnu", ++ "powerpc-unknown-freebsd", + "powerpc-unknown-linux-gnu", + "powerpc-unknown-linux-gnuspe", + "powerpc-unknown-linux-musl", +--- cargo-crates/crossbeam-utils-0.8.5/no_atomic.rs.orig 2021-07-12 16:01:05.023177000 +0200 ++++ cargo-crates/crossbeam-utils-0.8.5/no_atomic.rs 2021-07-12 16:01:16.538869000 +0200 +@@ -30,6 +30,7 @@ + "mipsel-unknown-none", + "mipsisa32r6-unknown-linux-gnu", + "mipsisa32r6el-unknown-linux-gnu", ++ "powerpc-unknown-freebsd", + "powerpc-unknown-linux-gnu", + "powerpc-unknown-linux-gnuspe", + "powerpc-unknown-linux-musl",