From nobody Wed Sep 11 07:04: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 4X3Wm56Z6tz5VvWD; Wed, 11 Sep 2024 07:04: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X3Wm55LVNz53hN; Wed, 11 Sep 2024 07:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726038293; 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=SpRX9QVRRa9VikDwhK1/xn1lavdAgaQFs0mLXgqy0o4=; b=dYeyYZKtCx0ZdqBiDVb+s6qRqGOvrw/AuyLlpoMTb4YuqS1P4It3dxIgEDbKYwb2nby//o drgRU0J0W4ECawgBLw7YnuR30D2AbJuaRcT8W/67I1u0R4VP4TOhGAf0rQazmvPZV2oZM7 FK6lOVgQ4onYxJgVE4/x/HnDvPnozOI+TCFzPymCsWXvkeSSF25ZxAGyNdYYdSVTuXs5zy r2LrZCkZQpon0eoCTZd9+7UOZQeNCjyC7NvOyPJIwujc2MUNGeRhkfoJFI64neHLnEK8M7 7tHmGIiYoEzpInB22iDGwfQKluBHN/9Kj3jxi/iZ9TlJmknPdA8XtGAxzPTdyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726038293; a=rsa-sha256; cv=none; b=pTJ6YeiR2nrbdWjlPrlAr5N5RBVrD8Z6r/W/IoEvatpe7nUiJzoGK9hLQIRGeiOIcr0hME e3+TqK8Q/iyb0MZsH3ANpJa9O3JrIIg05QCOymu82AGtI6ouehMlkskLMHDOV8FaGU92ly /0pwCrrukfO2yApsBol/LKefLP/BdTfwfJl8lmtvfLj1aMigAxsfuK/ey1m5vt6WZWyxDP tadbABPZmvjMT269LChatSUfa5Qur7CAhr4i07jJ4L26Nl8p92W2ByTlM1pa3a/HsbXl4Q ivAHQaUDE5DuPMFqwijXwTXn44zZQmHee59lutW2Ezey+CDD9gVHjQOXEcXd3w== 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=1726038293; 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=SpRX9QVRRa9VikDwhK1/xn1lavdAgaQFs0mLXgqy0o4=; b=m5wybnCEUEA0A5ilKR8Y/pZN/EpHUdo+pTqpoIYiCGg2OM3Ldauueh8qNptIZVkKho5LJd JuPYrc2OdJBJQJX1S9fBw5/Z8NQwl9Uv4SfDY6BpVvZG1GAO7gJ/262SSQyQTlretFF8Nw SydNQURr4W8/+DOO2cTbCoOIb6VZ3oWtXEAyEBpzeFpZS32HuNWG1dRYR/2BiQ6goRLg0/ 55Xw9z+TSgnlOqyYjJwdPZB4a/ZP4559kS0A1Zf+PUmVDJOmNxrn37Lh5Io87+IHLCrVwQ l/PFmVPXQ8iDUOp/VGEfK/1be9bswr6X/ICnJ1Zp87iMnz8M2VPczvQ48dNi9A== 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 4X3Wm54yHbzLyq; Wed, 11 Sep 2024 07:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48B74r13037109; Wed, 11 Sep 2024 07:04:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48B74rJj037106; Wed, 11 Sep 2024 07:04:53 GMT (envelope-from git) Date: Wed, 11 Sep 2024 07:04:53 GMT Message-Id: <202409110704.48B74rJj037106@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: 8e41b84f9b1a - main - net-im/signal-desktop: Fix build 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: 8e41b84f9b1a341035ece81ec08ff4db1acdedd8 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=8e41b84f9b1a341035ece81ec08ff4db1acdedd8 commit 8e41b84f9b1a341035ece81ec08ff4db1acdedd8 Author: Mikael Urankar AuthorDate: 2024-09-11 07:04:18 +0000 Commit: Mikael Urankar CommitDate: 2024-09-11 07:04:18 +0000 net-im/signal-desktop: Fix build Bump better-sqlite3 to the required version. PR: 281430 --- net-im/signal-desktop/Makefile | 2 +- net-im/signal-desktop/distinfo | 6 +++--- net-im/signal-desktop/get_deps.sh | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 39ed8c0e4d1b..ac013fffb2eb 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -89,7 +89,7 @@ _BUILD_DATE= $$(date +'%s') ELECTRON_VER_MAJOR= 30 ESBUILD_VERSION= 0.21.2 -SQLCIPHER= sqlcipher-4.5.5-fts5-fix--3.0.7--0.2.1-ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b +SQLCIPHER= sqlcipher-4.6.1--3.0.7--0.2.1-7c30de8bcb5d21127803f5ab19a097e1b508d05744aca3ac6166352506b5f451 NODE_ARCH= ${ARCH:S/aarch64/arm64/:S/amd64/x64/} APP_OUT_DIR= linux-${ARCH:S/aarch64/arm64-/:S/amd64//}unpacked diff --git a/net-im/signal-desktop/distinfo b/net-im/signal-desktop/distinfo index e39c808be547..5df0b7d74d9b 100644 --- a/net-im/signal-desktop/distinfo +++ b/net-im/signal-desktop/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1725883102 +TIMESTAMP = 1726037877 SHA256 (signal-desktop-7.23.0-npm-cache.tar.gz) = 1c2f8c03c4676c73ba368e919a3005e0ce1bfd773b3e329fe0c042f977a53123 SIZE (signal-desktop-7.23.0-npm-cache.tar.gz) = 324496050 -SHA256 (sqlcipher-4.5.5-fts5-fix--3.0.7--0.2.1-ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b.tar.gz) = ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b -SIZE (sqlcipher-4.5.5-fts5-fix--3.0.7--0.2.1-ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b.tar.gz) = 75708533 +SHA256 (sqlcipher-4.6.1--3.0.7--0.2.1-7c30de8bcb5d21127803f5ab19a097e1b508d05744aca3ac6166352506b5f451.tar.gz) = 7c30de8bcb5d21127803f5ab19a097e1b508d05744aca3ac6166352506b5f451 +SIZE (sqlcipher-4.6.1--3.0.7--0.2.1-7c30de8bcb5d21127803f5ab19a097e1b508d05744aca3ac6166352506b5f451.tar.gz) = 75824751 SHA256 (signalapp-Signal-Desktop-v7.23.0_GH0.tar.gz) = 00b3d03050545cc5f6d3fc9c729627ca7068d75476fc33c791c171530689ed5d SIZE (signalapp-Signal-Desktop-v7.23.0_GH0.tar.gz) = 42326613 diff --git a/net-im/signal-desktop/get_deps.sh b/net-im/signal-desktop/get_deps.sh index cccc2a4c122a..284303f8693a 100644 --- a/net-im/signal-desktop/get_deps.sh +++ b/net-im/signal-desktop/get_deps.sh @@ -18,3 +18,15 @@ electron_version=$(grep '"electron":' /tmp/package.json | awk -F ":" '{print $2} echo "ELECTRON_VERSION= ${electron_version}" bsqlite3_version=$(grep '@signalapp/better-sqlite3' /tmp/package.json | awk -F ":" '{print $2}' | sed -E 's#("|,| )##g') + +fetch -qo /tmp/download.js https://raw.githubusercontent.com/signalapp/better-sqlite3/v${bsqlite3_version}/deps/download.js +BASE_URI=https://build-artifacts.signal.org/desktop +HASH=$(awk /"HASH ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g") +SQLCIPHER_VERSION=$(awk /"SQLCIPHER_VERSION ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g") +OPENSSL_VERSION=$(awk /"OPENSSL_VERSION ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g") +TOKENIZER_VERSION=$(awk /"TOKENIZER_VERSION ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g") +TAG="${SQLCIPHER_VERSION}--${OPENSSL_VERSION}--${TOKENIZER_VERSION}" +echo "Signal-FTS5-Extension= ${TOKENIZER_VERSION}" +echo "SQLCIPHER=sqlcipher-${TAG}-${HASH}" | portedit merge -i Makefile + +echo "fetch https://build-artifacts.signal.org/desktop/sqlcipher-${TAG}-${HASH}.tar.gz"