From nobody Mon Nov 13 17:31:58 2023 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 4STc1W2c3Lz4cYtX; Mon, 13 Nov 2023 17:31:59 +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 4STc1W1Bcvz4PBd; Mon, 13 Nov 2023 17:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699896719; 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=2mnNDRGnZxxRP0rEGeiXLT37q9RQroQ9QKYN08r+oeM=; b=LfZikyetHAYLUzmr+dBSrhqVKAbShYrT0FFQPMwqcU2mvL8aXOyuESiVc6PyaCvRYrML2f Gc/+DcDPtYc0PUNB60KCrUYKNVM8MB1itPMbe2JKzJJimNNlfFxNeciZlEdo9CSYkheseZ OiWCKBzya3glvprisKIoMyouiqWRWVO/aawA9E5/dxmqJjnzA7Jk3jZambjoGvJnCY7XhJ GWOu4LagV+NrRYN5vzOrsSNr8HA9X/EhCkZnr47YI4bhnMszwi0jehFwKrbCmBdOwDLhyg d18YdHBpJKgDHqNm/R+Bb5x/+msV6+V/7c26DXGoCgynxW777gXbDIlIfL6mRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699896719; 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=2mnNDRGnZxxRP0rEGeiXLT37q9RQroQ9QKYN08r+oeM=; b=as1QGDs6adeC1HfelrhTavRbWiUQzbpS54mIz8LubZXavUgz1uwC3XYUW/Osqhe40AE24V 9ewRm1CfQTrlRO4dkoUY4VQpRDNJWdD2kv9aMVzgzddabrz7xkoIcDpnsLfxLFv/H7+evQ AzeUUpIdcu+HvKtTImO7W9jConKqnv/D6kk98VbPpuC0W49TN2ipRFfMdQApQNU6kRCvlr mlsTeGhnWTNKnR+NiStuW3ENlvGoiVW4D6el2dwC83LcfkEVnGzaseNK5iu7J72lDdqztL W4cHmjW+J0d24mwOMz9dMtBDET121eGevUwdCLdvhBDZUjnBMkJOCOWl614Mmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699896719; a=rsa-sha256; cv=none; b=QkNOi96IAXGJ1CErF56XuLSYD59ysVK15zUhzQCdYNFu28iPPoOoCyWssGsB3flP/pQsa1 p3L2iJhASdHu9m/CCXfy5mpdSw/JPsJ79jgayyuCdCVtT7wxSw5AS8MHMiTLQ49UFQDe7S Vk2noaJjardVXu2nzwdxgcuHbuCCv5i0Hb+mTvyv4EHk0Gaj2g0/N6TwJ1b4tMhsk1Ro2b YacT7ITf3zBvzbGPuyX+uKSs4EJXQQoEqGrxyzhICpE2Xuw7hpJLilmtBVaCp9ovvhVwwC pJsgIJb9s+QZDp4LkUY151wXljagmgWjBkYOmtDleafF1a4kbiT8/r834ojjlw== 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 4STc1V75gRzw7; Mon, 13 Nov 2023 17:31:58 +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 3ADHVw31074101; Mon, 13 Nov 2023 17:31:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ADHVweg074098; Mon, 13 Nov 2023 17:31:58 GMT (envelope-from git) Date: Mon, 13 Nov 2023 17:31:58 GMT Message-Id: <202311131731.3ADHVweg074098@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: d7cdb8ef9b3e - main - net-im/signal-desktop: Update to 6.38.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: 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: d7cdb8ef9b3e5308750542c61089bbdc5e61854a Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=d7cdb8ef9b3e5308750542c61089bbdc5e61854a commit d7cdb8ef9b3e5308750542c61089bbdc5e61854a Author: Mikael Urankar AuthorDate: 2023-11-13 17:30:44 +0000 Commit: Mikael Urankar CommitDate: 2023-11-13 17:30:44 +0000 net-im/signal-desktop: Update to 6.38.0 Changes: https://github.com/signalapp/Signal-Desktop/releases/tag/v6.36.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v6.37.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v6.38.0 --- net-im/signal-desktop/Makefile | 24 +++++++++++------------- net-im/signal-desktop/distinfo | 14 +++++++------- net-im/signal-desktop/get_deps.sh | 2 +- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 7b054fb3bded..2b7ab3c2eb26 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -1,13 +1,13 @@ PORTNAME= signal-desktop DISTVERSIONPREFIX= v -DISTVERSION= 6.35.0 +DISTVERSION= 6.38.0 CATEGORIES= net-im MASTER_SITES= LOCAL/mikael/signal-desktop/:npm \ LOCAL/mikael/signal-desktop/:sqlite \ LOCAL/mikael/signal-desktop/:yarn \ https://build-artifacts.signal.org/desktop/:sqlcipher DISTFILES= signal-desktop-${DISTVERSION}-yarn-cache.tar.gz:yarn \ - signal-desktop-6.4.1-npm-cache.tar.gz:npm \ + signal-desktop-6.37.0-npm-cache.tar.gz:npm \ ${SQLCIPHER}.tar.gz:sqlcipher MAINTAINER= mikael@FreeBSD.org @@ -88,10 +88,10 @@ _BUILD_DATE= $$(date +'%s') ELECTRON_VER_MAJOR= 25 # sh get_deps.sh -NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.31.0-f420a009f97b80ba5da216b9cdaec543f3ef7097-integrity -NPM_RINGRTC_DIR= npm-@signalapp-ringrtc-2.33.0-a18baa71c43e4a4d5ea996febcdfaac4e5a62f51-integrity +NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.32.1-e1ac48debb399ceff8f2868f0b5ecb75c2fc2ed0-integrity +NPM_RINGRTC_DIR= npm-@signalapp-ringrtc-2.34.0-a6665fe6587610d9bdf971890249fd5df2207473-integrity NPM_SQLITE3_DIR= npm-@signalapp-better-sqlite3-8.5.2-910669f44e76a46d06df45fabefcd3ac2e7c4cce-integrity -NPM_ESBUILD_VERS= 0.17.11 +NPM_ESBUILD_VERS= 0.18.20 SQLCIPHER= sqlcipher-4.5.5-fts5-fix--3.0.7--0.2.1-ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b ESBUILD_ARCH= ${ARCH:S/aarch64/arm64/:S/amd64/x64/} @@ -115,6 +115,7 @@ fetch-yarn: if [ ! -f ${DISTDIR}/signal-desktop-${DISTVERSION}-yarn-cache.tar.gz ]; then \ ${MKDIR} /tmp/signal-desktop; \ ${FETCH_CMD} -o - https://raw.githubusercontent.com/signalapp/Signal-Desktop/v${DISTVERSION}/package.json | \ + ${PREFIX}/bin/jq '.devDependencies.esbuild = "0.18.20"' | \ ${PREFIX}/bin/jq '.engines.node = ""' > /tmp/signal-desktop/package.json; \ ${FETCH_CMD} -o /tmp/signal-desktop/yarn.lock https://raw.githubusercontent.com/signalapp/Signal-Desktop/v${DISTVERSION}/yarn.lock; \ ${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \ @@ -122,7 +123,7 @@ fetch-yarn: ${PREFIX}/bin/jq 'del(.devDependencies."@signalapp/mock-server")' /tmp/signal-desktop/package.json > /tmp/signal-desktop/package.json.tmp; \ ${MV} /tmp/signal-desktop/package.json.tmp /tmp/signal-desktop/package.json; \ cd /tmp/signal-desktop && ${SETENV} HOME=/tmp/signal-desktop XDG_CACHE_HOME=/tmp/signal-desktop/.cache \ - yarn --frozen-lockfile --ignore-scripts; \ + yarn --ignore-scripts; \ ${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \ -e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \ -e 's:\([gu]id\)=[0-9]*:\1=0:g' \ @@ -138,13 +139,15 @@ post-extract: ${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' > ${WRKSRC}/.yarnrc ${ECHO_CMD} 'nodedir "${LOCALBASE}"' >> ${WRKSRC}/.yarnrc # Update node engine - ${PREFIX}/bin/jq '.engines.node = ""' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp + ${PREFIX}/bin/jq '.engines.node = ""' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp.1 + ${PREFIX}/bin/jq '.devDependencies.esbuild = "0.18.20"' ${WRKSRC}/package.json.tmp.1 > ${WRKSRC}/package.json.tmp ${MV} ${WRKSRC}/package.json.tmp ${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 + ${CP} ${FILESDIR}/yarn.lock ${WRKSRC} cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} yarn install --frozen-lockfile --ignore-optional --offline || ${TRUE} + ${SETENV} ${MAKE_ENV} yarn install --ignore-optional --offline || ${TRUE} do-build: ${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' > ${WRKSRC}/.yarnrc @@ -224,12 +227,7 @@ do-install: create-caches-tarball: # do some cleanup first ${RM} -r ${WRKDIR}/.npm/_logs ${WRKDIR}/.npm/_update-notifier-last-checked ${WRKDIR}/.cache/yarn/v6/.tmp - ${FIND} ${WRKDIR}/.cache -type f -perm 755 -exec file {} \; | ${EGREP} "ELF|PE32+|Mach-O" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM} - cd ${WRKDIR} && \ - ${TAR} czf signal-desktop-${DISTVERSION}-yarn-cache.tar.gz .cache yarn-cache - cd ${WRKDIR} && \ - ${TAR} czf signal-desktop-${DISTVERSION}-electron-gyp-cache.tar.gz .electron-gyp cd ${WRKDIR} && \ ${TAR} czf signal-desktop-${DISTVERSION}-npm-cache.tar.gz .npm diff --git a/net-im/signal-desktop/distinfo b/net-im/signal-desktop/distinfo index 6d3b5b1d95bb..24d26cac6d2b 100644 --- a/net-im/signal-desktop/distinfo +++ b/net-im/signal-desktop/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1697785584 -SHA256 (signal-desktop-6.35.0-yarn-cache.tar.gz) = fc3e8ef83cd33da3c2cb61377d5b261550b8e4a7d328be6db64f1fcd5304d608 -SIZE (signal-desktop-6.35.0-yarn-cache.tar.gz) = 374320508 -SHA256 (signal-desktop-6.4.1-npm-cache.tar.gz) = 8acc503a579760faf8ea660d504f3b3ffadc495bf09584228da4cc9af20e33fe -SIZE (signal-desktop-6.4.1-npm-cache.tar.gz) = 4466353 +TIMESTAMP = 1699646377 +SHA256 (signal-desktop-6.38.0-yarn-cache.tar.gz) = 3bd06a74056c1ef250acba55b9963a373c3512cd5e4c95e5f04d14d5b73be3f2 +SIZE (signal-desktop-6.38.0-yarn-cache.tar.gz) = 515648788 +SHA256 (signal-desktop-6.37.0-npm-cache.tar.gz) = 40411861a3b913b26a4bb563faa72a4c07c8807b917e53f627c58fa3b3b695a8 +SIZE (signal-desktop-6.37.0-npm-cache.tar.gz) = 4471369 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-v6.35.0_GH0.tar.gz) = 822a4f5b722c6288e28c2d697093fa90a2d71c63bb336ef1f6194bb11b26dc80 -SIZE (signalapp-Signal-Desktop-v6.35.0_GH0.tar.gz) = 42554576 +SHA256 (signalapp-Signal-Desktop-v6.38.0_GH0.tar.gz) = f147de8752c05d235e866f7b5d5513365a7b6bd4ea5ccdeda254a2171dc2d1f3 +SIZE (signalapp-Signal-Desktop-v6.38.0_GH0.tar.gz) = 42634187 diff --git a/net-im/signal-desktop/get_deps.sh b/net-im/signal-desktop/get_deps.sh index bc504e3101b3..04546bc4a53b 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=v6.35.0 +SIGNAL_VERS=v6.38.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')