From nobody Fri Jan 12 17:02:05 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 4TBSWK5KSDz579Ty; Fri, 12 Jan 2024 17:02:05 +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 4TBSWK3SYgz4YsF; Fri, 12 Jan 2024 17:02:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705078925; 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=PZBiTzNJk9AcKAAntag5Hl1O6AwD1JtfgAUaIgHnN7Y=; b=fzo4xqDX+JHlGk0G75pJJZW17LbpjNQPjbV3CkJcc1OqjD3eqkFTQhhf/C2VgA0coImL5c PvhKaKmxstLyUqUawFsevLXJGirAxceG8YU3I/J9AJ8NWiWcagOX6WcR9pp3epJ5TVfLvc cq9JvHSoOP37c6/8JX0d9yzinC/A1eO8Zz3lhdf8p6Q6tuctjcha3QZAN49p6lK38kXdK7 T9ZGWj1OhXSk1BHg3CwytMGg1gdn9x5166jFMinmt9oZrlFx2h9ftCvj1BM0SOXCJH7FXH 7ecvL1iC2aB3Vwc0SvT5cbrR1fRJ60UBiKhDENSU6fegd797KOICWTHimQj45g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705078925; 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=PZBiTzNJk9AcKAAntag5Hl1O6AwD1JtfgAUaIgHnN7Y=; b=DrGDbbEJ1p6VE4beF67QoFZ2Xxu2dxmgwzWc0fhZ5Pp6S+BNZh3iFWeOxEINiW6iDIK7nI Mu3LwWSu1bjeQ+cjnjoSgGejYD3va1PTxNR84TuVis1m7zSSW4v049nNcrFcG+xqjCidgZ ECgjB+rqAnqgsvj0rMaVM5tqb81bInYuU9VOW/zB6uzY1tohGkhxtGf+oqpcoo32GN0G4w p8VYG70ovRadsImtkH9IMnVSuWTygcssxTJq9T9VKLtajrIvqxXBm/274t7ABjM06mnahf x04ZV6QChbrWNFUYtCSQ6tBPg4aA8TpoNI06PTutX0cNf6gsUtkzS3MOT8RpqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705078925; a=rsa-sha256; cv=none; b=M4riE6RVKAEDEtzJI51w8VIaaMRhv8qlwTAUlOoZmaugx3V+13BuiN9ADfP7LqVP0K2sMP Q1f1Mx8EBwomui8r0JJI/dItr9als8X3tGJX44IJVevFxDjpYLc8e2h+ez47yiAvBlUi+5 JtjksMdCVp6FKR+b+2piXvMqWsQTVgUIzIe9YDU/xpeKFG+VifpDbzV+niK6pHcRNOjkCI OwJWL4jHFEcUS2txvpGIj+yGsyl+o+HLjTV4mJdOQUjR7jrcFjyiEP7Cnv+jzRI6phtLEH hkzOeEP9JQQxQzXeGWAl1rRRbfB0ygpkMl7i2HPmT0N9f6vg7Qn4WZk5+N1Viw== 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 4TBSWK2Xbpz193Q; Fri, 12 Jan 2024 17:02:05 +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 40CH25W9010292; Fri, 12 Jan 2024 17:02:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CH25RE010289; Fri, 12 Jan 2024 17:02:05 GMT (envelope-from git) Date: Fri, 12 Jan 2024 17:02:05 GMT Message-Id: <202401121702.40CH25RE010289@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: 1ea4180eb766 - main - net-im/libsignal-node: Fix build when git isn't installed 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: 1ea4180eb7662ef71b495dc4b066cc0bf9b21087 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ea4180eb7662ef71b495dc4b066cc0bf9b21087 commit 1ea4180eb7662ef71b495dc4b066cc0bf9b21087 Author: Mikael Urankar AuthorDate: 2024-01-12 17:00:27 +0000 Commit: Mikael Urankar CommitDate: 2024-01-12 17:01:53 +0000 net-im/libsignal-node: Fix build when git isn't installed Git is not mandatory as we can use the 'patch' utility --- .../libsignal-node/files/patch-boring_boring-sys_build.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/net-im/libsignal-node/files/patch-boring_boring-sys_build.rs b/net-im/libsignal-node/files/patch-boring_boring-sys_build.rs index 7ac2bddcd13c..6d9edb6ae629 100644 --- a/net-im/libsignal-node/files/patch-boring_boring-sys_build.rs +++ b/net-im/libsignal-node/files/patch-boring_boring-sys_build.rs @@ -1,5 +1,18 @@ --- ../boring-8245063ae6eb97d909982b89fad45bb7f0a2a1a0/boring-sys/build.rs.orig 2024-01-05 10:45:46 UTC +++ ../boring-8245063ae6eb97d909982b89fad45bb7f0a2a1a0/boring-sys/build.rs +@@ -456,9 +456,9 @@ fn ensure_patches_applied() -> io::Result<()> { + lock_file.lock()?; + + // NOTE: init git in the copied files, so we can apply patches +- if !has_git { +- run_command(Command::new("git").args(["init"]).current_dir(&src_path))?; +- } ++// if !has_git { ++// run_command(Command::new("git").args(["init"]).current_dir(&src_path))?; ++// } + + if cfg!(feature = "pq-experimental") { + println!("cargo:warning=applying experimental post quantum crypto patch to boringssl"); @@ -482,11 +482,9 @@ fn apply_patch(patch_name: &str) -> io::Result<()> { .canonicalize()?;