From nobody Tue May 7 10:47:21 2024 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 4VYZjP34wQz5KYy2; Tue, 07 May 2024 10:47:21 +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 4VYZjP2W6Qz4nRM; Tue, 7 May 2024 10:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715078841; 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=JleS838TcfdgM3q7Cm3bGZJ1iJE7JsGs3O2l4oP8LTw=; b=emz1gHzXu0BCY1B81Bnsj2ELJEj4iapX05xoXdQMRcJufTROCSDqNJa+z+Ef2dR+MBj6NP xdiQpjPUgCKjG36z42IXO06XJfAh9L4F/fB6eq9igcXyqQRqBxUu2qwih/OjxOo5rNFgc5 rQBTTspe57wkpkQxWk76zNUCFFyeXddLPnY1rgdC0DNDyQOnKeLeUEOUJU6xG3rO1bB5OF Vv6x3veCWfQZd73lEcHf8oXDmCSqV/Z6fn7tf7DJY4boVjkvDGiktZF94gaxYXVJgHxGa0 ZKvhqhWsVhpqo1imz3gbH0hZRAao3Yq5ycETWrxa2IE7RW81dIaoLKGp6kHGig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715078841; a=rsa-sha256; cv=none; b=nk/RJQUgxwMkcpY8lMvNyJBEq8VeSsybDNdOhuaYgZUA/uixIMRCLXwj5CxvzUmFteoLC4 wSvR9Q4+0SHIEku7mLDYpYcYvx6QHoehGtoyEPUa40GpixEgimtJQOpDBsFu6Qg5lFjxQz kAYPTVoH6irqwjE35py7rwjC8UQu3bfz7SlUTUCOY8WFC4NgHjh/3o6CJuzrBaXNVM4a4V VpItcdakZ5/0Y0IH1hFT/1qCsNhmspPH4Xhp6vJe+nSjCUSD0I4mUKyMkjf8Mq6tPMx368 EzRrozKt4QU/nO4eIk9GQm7jBLzWFnA/g36+cUU8JhPJLc3wZFSChOxzNWoyRw== 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=1715078841; 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=JleS838TcfdgM3q7Cm3bGZJ1iJE7JsGs3O2l4oP8LTw=; b=JIGVnJe3FyzrKDYecFzI+V/zXXwCOlK8zeY0D5dxvrkU0D78vbeMZQLHRA9vGTsMSVhRQD RvV2/1P0RDx8OD919pOuTqdA++S3fwdQcYXzTLu+CAqos69ZbxNaqQ/s+Zjl69jEYWaWW1 d+gddj7J81qTrvf+TESbqkDAfLquhL8IHQ+57WrsYLKDpoWSjcywjaeurQ1mPF84eKR/EV 8kR/thI+vihemZ8ErY9BLhDiIx8fIs4tNQn5lFqN76AjiyyVrGPGvo4f981LgiHu2bj/hu XdODmY2dIVqdXvblsSE2jQKnhTyBp/ilU5ggaFhj+QuzFTJvPXtxaEl6mrWQVQ== 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 4VYZjP1jKjzdcq; Tue, 7 May 2024 10:47:21 +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 447AlLh8007278; Tue, 7 May 2024 10:47:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 447AlLRw007275; Tue, 7 May 2024 10:47:21 GMT (envelope-from git) Date: Tue, 7 May 2024 10:47:21 GMT Message-Id: <202405071047.447AlLRw007275@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: a8e4e4587529 - main - net-im/libsignal-node: Fix yarn version in BUILD_DEPENDS 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: a8e4e4587529ce8aeaf6003ece97c507ed4e94a4 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=a8e4e4587529ce8aeaf6003ece97c507ed4e94a4 commit a8e4e4587529ce8aeaf6003ece97c507ed4e94a4 Author: Mikael Urankar AuthorDate: 2024-05-07 10:45:40 +0000 Commit: Mikael Urankar CommitDate: 2024-05-07 10:45:40 +0000 net-im/libsignal-node: Fix yarn version in BUILD_DEPENDS While here pet portlint. Reported by: jhibbits --- net-im/libsignal-node/Makefile | 9 +++++---- net-im/libsignal-node/files/patch-boring_boring-sys_main.rs | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/net-im/libsignal-node/Makefile b/net-im/libsignal-node/Makefile index 72f8046563b4..62c77be4514c 100644 --- a/net-im/libsignal-node/Makefile +++ b/net-im/libsignal-node/Makefile @@ -14,11 +14,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 -FETCH_DEPENDS= yarn-node20>0:www/yarn-node20 -EXTRACT_DEPENDS=yarn-node20>0:www/yarn-node20 +FETCH_DEPENDS= yarn-node${NODEJS_VERSION}>0:www/yarn-node${NODEJS_VERSION} +EXTRACT_DEPENDS=yarn-node${NODEJS_VERSION}>0:www/yarn-node${NODEJS_VERSION} BUILD_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ protoc:devel/protobuf \ - yarn:www/yarn-node18 + yarn:www/yarn-node${NODEJS_VERSION} USES= cargo gmake python:build USE_GITHUB= yes @@ -28,7 +28,7 @@ GH_ACCOUNT= signalapp # cd boring # git checkout correct_tag (grep boring Makefile.crates) # git submodule update --init --recursive -# the hash for boringssl and fips should be printed on screen +# the hash for boringssl and fips should be printed on screen GH_TUPLE= google:boringssl:44b3df6f03d85c901767250329c571db405122d5:boringssl \ google:boringssl:853ca1ea1168dff08011e5d42d94609cc0ca2e27:boringssl_fips @@ -46,6 +46,7 @@ USE_LDCONFIG= yes PLIST_FILES= lib/libsignal_node.so +NODEJS_VERSION= 20 NODE_ARCH= ${ARCH:S/aarch64/arm64/:S/amd64/x64/:S/i386/ia32/:C/powerpc64.*/ppc64/} NPM_RINGRTC_DIR= npm-@signalapp-ringrtc-2.36.0-67d1b48bd4c1ea31c155ea14a0bd28f04e46eff5-integrity NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.39.1-15b41f15c516ae3eecf8a098a9c9c7aac00444d7-integrity diff --git a/net-im/libsignal-node/files/patch-boring_boring-sys_main.rs b/net-im/libsignal-node/files/patch-boring_boring-sys_main.rs index f351053d5a9a..9ada79929d49 100644 --- a/net-im/libsignal-node/files/patch-boring_boring-sys_main.rs +++ b/net-im/libsignal-node/files/patch-boring_boring-sys_main.rs @@ -1,5 +1,5 @@ ---- ../boring-signal-v4.6.0/boring-sys/build/main.rs.orig 2024-04-27 16:40:34.000626000 +0200 -+++ ../boring-signal-v4.6.0/boring-sys/build/main.rs 2024-04-27 17:41:33.228588000 +0200 +--- ../boring-signal-v4.6.0/boring-sys/build/main.rs.orig 2024-04-27 16:40:34 UTC ++++ ../boring-signal-v4.6.0/boring-sys/build/main.rs @@ -477,9 +477,9 @@ fn ensure_patches_applied(config: &Config) -> io::Resu lock_file.lock()?;