From nobody Tue Aug 27 15:58:00 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 4WtXJ81sjdz52Mp2; Tue, 27 Aug 2024 15:58:00 +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 4WtXJ81CTKz4J6S; Tue, 27 Aug 2024 15:58:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724774280; 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=a7ynP+EFIk+oB4vuq91K7tw88BjwgScfny0p1/oMpm4=; b=hng5Sgq6ewFdUNL1+wofmFifnTv6K131ZPXfAaDfK09l0CUUY7TUOwfSmplwZGJofGg5J5 V+UbahkXLnZM72EKhq9n9noNjK/imiNn83HnARYO5C1hXI461QZf7A0KYmTcC1MKVbuMH/ qd0AqDMVyICTh0A/j/eU53FSB12uXCrzwbLb3l9pkUS7Q2nBWsHZypUmsKu9tdDtJri8Xw FZ2FL9S8EMw6p1PueIg1TNkGL1yrP9mN02bMJFtyVVVRvyoQ9JMiw/27NLxUKp2BJPn0lm BtAMOiekvIoKm6WAtQtsdEkcoREoJ/lAq4a8QUII3rUkK8myjUX1SM4H+mDjrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724774280; a=rsa-sha256; cv=none; b=NQByM8IIgzk6oT0qcMzr4lfT8RtvhwnUa7L/bxL+lV7cWs3FLLq6kFGYZIKqbMtMgX/goT z3Fm08DEMvp2o8zhErq8nTlg3Lf1wHYXWFCuHND9GoJOoV9zbrX12z/Q3r3PY3mxw4ypuT o/cCzkrEgG0IPX4wT7MrkPjMrYlV0+VE6oEQIYfMnjYuAgf+/KsTtmAadog1HXnt8zlz7b nGK1Ocb8yUf5HWhwoQ4HHYweDZ6YGOv7/BDrLuvPVO82Z+N2PbPGoNU8/eRhtBwcUg4r9c 0mBiUU+yHd01U/naa4x3wl4ADaH6QkUVSR33B2j+0gHC/oAWhjXeDLtb67ZNFQ== 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=1724774280; 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=a7ynP+EFIk+oB4vuq91K7tw88BjwgScfny0p1/oMpm4=; b=fou6ZBv9ZJIUjQ1rNa9sAjfimkjYbxkKZynvWrh1eSzTpQ7VMElUdts5Qufa+KbMPdOCAx QYd59EUaVzKiY/nzFB6G9hx3WLVaaJX/vaUVdDU1386TNXoDIk8v8BFAwY4LH7lclP034q 7xIgJAIJ76BP7AqXMkhRi2d3xFTI0ccaBGuGQ+6EMDRc0nK3fT020aZ5G/SbaEQD7Ljdx9 goaQgyoMUPuDT8mfu/BsvtXAsrF6k4asNu2Q+mrqoglTjp2kBoY1xO57TC+NqmwD/+VoQH 3uQvMg9Rvj1w3/tO8BctfQPQLvW1Mgt+YuU1yd7hu4Fr1kx+t6QD4McRUfAMVw== 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 4WtXJ80pllzwFw; Tue, 27 Aug 2024 15:58:00 +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 47RFw00H071531; Tue, 27 Aug 2024 15:58:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47RFw0WT071526; Tue, 27 Aug 2024 15:58:00 GMT (envelope-from git) Date: Tue, 27 Aug 2024 15:58:00 GMT Message-Id: <202408271558.47RFw0WT071526@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: 9ca231ec4120 - main - net-im/signal-desktop: Update to 7.21.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: 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: 9ca231ec4120a445965e771c4532b2f5b7c5580a Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ca231ec4120a445965e771c4532b2f5b7c5580a commit 9ca231ec4120a445965e771c4532b2f5b7c5580a Author: Mikael Urankar AuthorDate: 2024-08-26 15:55:34 +0000 Commit: Mikael Urankar CommitDate: 2024-08-27 15:57:56 +0000 net-im/signal-desktop: Update to 7.21.0 Fix build on aarch64 by using esbuild from ports instead of the npm one. [1] PR: 281039 [1] Tested by: jhibbits [1] --- net-im/signal-desktop/Makefile | 11 +- net-im/signal-desktop/distinfo | 10 +- net-im/signal-desktop/files/dns-fallback.json | 223 ------------------------- net-im/signal-desktop/files/patch-package.json | 10 -- net-im/signal-desktop/get_deps.sh | 2 +- 5 files changed, 13 insertions(+), 243 deletions(-) diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 4121324477bf..32e5f1a21a55 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -1,6 +1,6 @@ PORTNAME= signal-desktop DISTVERSIONPREFIX= v -DISTVERSION= 7.20.1 +DISTVERSION= 7.21.0 CATEGORIES= net-im MASTER_SITES= LOCAL/mikael/signal-desktop/:npm \ https://build-artifacts.signal.org/desktop/:sqlcipher @@ -26,6 +26,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libcrypto.a:security/openssl \ ${LOCALBASE}/lib/libsignal_tokenizer.a:devel/signal-fts5-extension \ app-builder>0:devel/app-builder \ electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \ + esbuild:devel/esbuild \ jq:textproc/jq \ npm:www/npm-node20 LIB_DEPENDS= libasound.so:audio/alsa-lib \ @@ -81,9 +82,12 @@ MAKE_ENV+= ELECTRON_SKIP_BINARY_DOWNLOAD=1 # This is a workaround to avoid filesystem violations during poudriere build MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 +MAKE_ENV+= ESBUILD_BINARY_PATH=${LOCALBASE}/bin/esbuild + _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 @@ -106,7 +110,8 @@ PLIST_SUB+= NOT_AARCH64="" post-extract: # Update node engine ${PREFIX}/bin/jq '.engines.node = ""' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp.1 - ${MV} ${WRKSRC}/package.json.tmp.1 ${WRKSRC}/package.json + ${PREFIX}/bin/jq '.devDependencies.esbuild = "${ESBUILD_VERSION}"' ${WRKSRC}/package.json.tmp.1 > ${WRKSRC}/package.json.tmp.2 + ${MV} ${WRKSRC}/package.json.tmp.2 ${WRKSRC}/package.json # remove mock-server as it doesn't build and is useless ${PREFIX}/bin/jq 'del(.devDependencies."@signalapp/mock-server")' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp ${MV} ${WRKSRC}/package.json.tmp ${WRKSRC}/package.json @@ -142,8 +147,6 @@ do-build: # patch-package can't patch sqlite3 on aarch64, patch the yarn cache instead cd ${WRKSRC} && ${PATCH} -s -N -i ${FILESDIR}/sqlite3.gyp.diff - ${CP} ${FILESDIR}/dns-fallback.json ${WRKSRC}/build - @${RM} -r ${WRKSRC}/node_modules/fs-xattr # # online build diff --git a/net-im/signal-desktop/distinfo b/net-im/signal-desktop/distinfo index 5b23023271aa..0b23d38fade7 100644 --- a/net-im/signal-desktop/distinfo +++ b/net-im/signal-desktop/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1724162534 -SHA256 (signal-desktop-7.20.1-npm-cache.tar.gz) = d540be9fe682918e44ad2aebafbe29696249c809d2de9679a52dc594af3d748d -SIZE (signal-desktop-7.20.1-npm-cache.tar.gz) = 320272079 +TIMESTAMP = 1724671750 +SHA256 (signal-desktop-7.21.0-npm-cache.tar.gz) = 6904ef3a6e5906fa451995be2519053bb24d82ed4c8f4eca3c765c4d12c693e5 +SIZE (signal-desktop-7.21.0-npm-cache.tar.gz) = 323140115 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 (signalapp-Signal-Desktop-v7.20.1_GH0.tar.gz) = 871c5583a68c71c1ca5189b120106c764ffde0400daa9c095617f7594c9081a8 -SIZE (signalapp-Signal-Desktop-v7.20.1_GH0.tar.gz) = 42301457 +SHA256 (signalapp-Signal-Desktop-v7.21.0_GH0.tar.gz) = 4506a3639685dd191f713d70ed3c6624a77cafe8fd6ff3f113b340d2cd337526 +SIZE (signalapp-Signal-Desktop-v7.21.0_GH0.tar.gz) = 42308410 diff --git a/net-im/signal-desktop/files/dns-fallback.json b/net-im/signal-desktop/files/dns-fallback.json deleted file mode 100644 index 4a87ba42f08b..000000000000 --- a/net-im/signal-desktop/files/dns-fallback.json +++ /dev/null @@ -1,223 +0,0 @@ -[ - { - "domain": "cdn.signal.org", - "endpoints": [ - { - "family": "ipv4", - "address": "99.84.9.12" - }, - { - "family": "ipv4", - "address": "99.84.9.126" - }, - { - "family": "ipv4", - "address": "99.84.9.19" - }, - { - "family": "ipv4", - "address": "99.84.9.49" - }, - { - "family": "ipv6", - "address": "2600:9000:215b:1c00:1d:4f32:50c0:93a1" - }, - { - "family": "ipv6", - "address": "2600:9000:215b:5000:1d:4f32:50c0:93a1" - }, - { - "family": "ipv6", - "address": "2600:9000:215b:5a00:1d:4f32:50c0:93a1" - }, - { - "family": "ipv6", - "address": "2600:9000:215b:600:1d:4f32:50c0:93a1" - }, - { - "family": "ipv6", - "address": "2600:9000:215b:6a00:1d:4f32:50c0:93a1" - }, - { - "family": "ipv6", - "address": "2600:9000:215b:6c00:1d:4f32:50c0:93a1" - }, - { - "family": "ipv6", - "address": "2600:9000:215b:9200:1d:4f32:50c0:93a1" - }, - { - "family": "ipv6", - "address": "2600:9000:215b:ae00:1d:4f32:50c0:93a1" - } - ] - }, - { - "domain": "cdn2.signal.org", - "endpoints": [ - { - "family": "ipv4", - "address": "104.18.37.148" - }, - { - "family": "ipv4", - "address": "172.64.150.108" - }, - { - "family": "ipv6", - "address": "2606:4700:4400::6812:2594" - }, - { - "family": "ipv6", - "address": "2606:4700:4400::ac40:966c" - } - ] - }, - { - "domain": "cdn3.signal.org", - "endpoints": [ - { - "family": "ipv4", - "address": "104.18.37.148" - }, - { - "family": "ipv4", - "address": "172.64.150.108" - }, - { - "family": "ipv6", - "address": "2606:4700:4400::6812:2594" - }, - { - "family": "ipv6", - "address": "2606:4700:4400::ac40:966c" - } - ] - }, - { - "domain": "cdsi.signal.org", - "endpoints": [ - { - "family": "ipv4", - "address": "40.122.45.194" - }, - { - "family": "ipv6", - "address": "2603:1030:7::1" - } - ] - }, - { - "domain": "chat.signal.org", - "endpoints": [ - { - "family": "ipv4", - "address": "13.248.212.111" - }, - { - "family": "ipv4", - "address": "76.223.92.165" - }, - { - "family": "ipv6", - "address": "2600:9000:a507:ab6d:4ce3:2f58:25d7:9cbf" - }, - { - "family": "ipv6", - "address": "2600:9000:a61f:527c:d5eb:a431:5239:3232" - } - ] - }, - { - "domain": "create.signal.art", - "endpoints": [ - { - "family": "ipv4", - "address": "44.207.181.6" - }, - { - "family": "ipv4", - "address": "52.204.93.252" - }, - { - "family": "ipv4", - "address": "52.21.33.241" - }, - { - "family": "ipv4", - "address": "54.161.129.211" - }, - { - "family": "ipv4", - "address": "54.82.41.49" - }, - { - "family": "ipv6", - "address": "2600:1f18:3b01:a400:50a:6a97:cc05:a890" - }, - { - "family": "ipv6", - "address": "2600:1f18:3b01:a401:7a9c:f91f:e59c:5150" - }, - { - "family": "ipv6", - "address": "2600:1f18:3b01:a402:7a63:4b38:fc8e:c770" - }, - { - "family": "ipv6", - "address": "2600:1f18:3b01:a403:2ddd:bb5a:737f:803a" - }, - { - "family": "ipv6", - "address": "2600:1f18:3b01:a404:d873:8664:8149:d8bd" - } - ] - }, - { - "domain": "sfu.voip.signal.org", - "endpoints": [ - { - "family": "ipv4", - "address": "34.36.104.134" - }, - { - "family": "ipv6", - "address": "2600:1901:0:8755::" - } - ] - }, - { - "domain": "storage.signal.org", - "endpoints": [ - { - "family": "ipv4", - "address": "216.58.213.83" - }, - { - "family": "ipv6", - "address": "2a00:1450:4007:80e::2013" - } - ] - }, - { - "domain": "updates2.signal.org", - "endpoints": [ - { - "family": "ipv4", - "address": "104.18.43.97" - }, - { - "family": "ipv4", - "address": "172.64.144.159" - }, - { - "family": "ipv6", - "address": "2606:4700:4400::6812:2b61" - }, - { - "family": "ipv6", - "address": "2606:4700:4400::ac40:909f" - } - ] - } -] diff --git a/net-im/signal-desktop/files/patch-package.json b/net-im/signal-desktop/files/patch-package.json deleted file mode 100644 index 90f469c31af1..000000000000 --- a/net-im/signal-desktop/files/patch-package.json +++ /dev/null @@ -1,10 +0,0 @@ ---- package.json.orig 2024-07-08 15:06:16 UTC -+++ package.json -@@ -76,7 +76,6 @@ - "build": "run-s --print-label generate build:esbuild:prod build:release", - "build-linux": "run-s generate build:esbuild:prod && npm run build:release -- --publish=never", - "build:acknowledgments": "node scripts/generate-acknowledgments.js", -- "build:dns-fallback": "node ts/scripts/generate-dns-fallback.js", - "build:icu-types": "node ts/scripts/generate-icu-types.js", - "build:compact-locales": "node ts/scripts/generate-compact-locales.js", - "build:dev": "run-s --print-label generate build:esbuild:prod", diff --git a/net-im/signal-desktop/get_deps.sh b/net-im/signal-desktop/get_deps.sh index 7d2b47293476..b749a0c5d1ac 100644 --- a/net-im/signal-desktop/get_deps.sh +++ b/net-im/signal-desktop/get_deps.sh @@ -1,5 +1,5 @@ #!/bin/sh -SIGNAL_VERS=v7.20.1 +SIGNAL_VERS=v7.21.0 fetch -qo /tmp/package.json https://raw.githubusercontent.com/signalapp/Signal-Desktop/${SIGNAL_VERS}/package.json node_version=$(awk /'"node":'/'{print $2}' /tmp/package.json | sed 's/"//g')