From nobody Sun Feb 12 18:46:20 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 4PFGdm6PRVz3qXsC; Sun, 12 Feb 2023 18:46:20 +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 4PFGdm5yYDz3rB3; Sun, 12 Feb 2023 18:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676227580; 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=jfM7NppxK7i6mPGBnN1Q34P+XRP6QqSmLMilR+npnck=; b=J4jcZL+Gf99vs1s/PXd0nRO2FORRyTGMLnHcePVRLW9C3WwHZBonrirwEaoYRXk2Uxodm/ zoCAzeMTmhhBbey6HJRRpUtpVxu2wlXX5S3bLS9IPgJsLY6+fXINCxwGOYbpSx57VieFDa oWY3naWlga4Jd9vxKaITt1u30uKDQcmbSw7Hj94wG0RIiAiw8mQ8kK6/W5S6or0EFr/L+E On638dwx0DV1PsLZCoikJoeAhe7BQY7QkqAz05+3J0v4WXRMTpQrTj09l5WG/sqRrVb9jQ E6OL28cCgwCpPKAp9c8LcbXHm1GpB2a/j5b1yWzVo688R95PoTCRwfMFzWuQ9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676227580; 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=jfM7NppxK7i6mPGBnN1Q34P+XRP6QqSmLMilR+npnck=; b=cMZAoqfeKHcEP8x6LypCxYoQLIJuzykP6TPLmUe/Tnm5s//sfpVNVI/CqyIle5UmZzEU8n O+D8rwXggcg4ZG6zaX/REE7okPnaUVBfuAN1fn2ecgUN0PoC+qm7GfkTgzuMKkZFkgtP+c tzqrVJrXAxwv/0Cw/TuqG/MzExHW5H+88icPSaY2d80lZzdCYG8QhsQjBKcqJ0QF3TTASk xIDbn4YRRVngU/QxLNj0o7FosEtBs0ZmdBhHHsgKQwoWVopl0Y5G5bxRBhQdfg9z7Mppu0 SCqXO8SG0l20Bq8eZM9V02VLhcRg8o32sC4I33q2Txmf3KVtSCcb+1Nrq4asYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676227580; a=rsa-sha256; cv=none; b=yxdJDWXt1hQwB55gLWfhKIIyxHltMs+6HA4EuzIpkRXgYzhYvJI4RLgrg1mCveUm6Kwxht Gq54DFz7uytf4fw+WjErjA8gWLxa6/0GnQCntyN9VPx769tetTzfb71a2e91dSxOz6VSVH EcG8ruvLVAX1WmDBdrPNAhV3y6Q6pPFFkOJLq6NJf/T0FrsH5E0OSP4OFsTiiuEMg1LqNq 6RH7K/1EE9gOoNWdzOsAPk8q0ENivpaNZqSBqmBSCVyiG5e/ELIfu43Ui+6MrH2OTgKiqg MjgpF07nEEQmvW/iWIEWA/hSXhcCa9dMZR9LmCO5Ew2fHYMQ7L9nZ2XNxpDOfw== 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 4PFGdm4wQtzpnc; Sun, 12 Feb 2023 18:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31CIkKfL097591; Sun, 12 Feb 2023 18:46:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31CIkK0V097590; Sun, 12 Feb 2023 18:46:20 GMT (envelope-from git) Date: Sun, 12 Feb 2023 18:46:20 GMT Message-Id: <202302121846.31CIkK0V097590@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 7eb53411684a - main - security/keybase: Update to 6.0.4 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7eb53411684a9ce0239532a53180865e6e13bb2d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=7eb53411684a9ce0239532a53180865e6e13bb2d commit 7eb53411684a9ce0239532a53180865e6e13bb2d Author: Po-Chuan Hsieh AuthorDate: 2023-02-12 18:36:42 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-02-12 18:36:42 +0000 security/keybase: Update to 6.0.4 - Convert to USES=go:modules I reached out to Dmitri Goutnik (dmgk@) in order to convert this port to USES=go:modules where upstream puts go.mod in a subdirectory. Thanks to him for providing both detailed explanation and complete patch for this update. Changes: https://github.com/keybase/client/releases --- security/keybase/Makefile | 20 +++++++++++++------- security/keybase/distinfo | 8 +++++--- ...dor-golang.org-x-sys-unix-ztypes_freebsd_arm64.go | 13 ------------- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/security/keybase/Makefile b/security/keybase/Makefile index 6cea50657197..5688bf69a073 100644 --- a/security/keybase/Makefile +++ b/security/keybase/Makefile @@ -1,9 +1,11 @@ PORTNAME= keybase -PORTVERSION= 5.8.1 -PORTREVISION= 7 +PORTVERSION= 6.0.4 DISTVERSIONPREFIX= v -MASTER_SITES= https://github.com/keybase/client/releases/download/v${PORTVERSION}/ +MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/go/:gomod +#MASTER_SITES= https://raw.githubusercontent.com/keybase/client/v${PORTVERSION}/go/:gomod CATEGORIES= security +DISTFILES= go.mod:gomod + MAINTAINER= sunpoet@FreeBSD.org COMMENT= Keybase.io client and Keybase Filesystem (KBFS) @@ -12,12 +14,16 @@ WWW= https://keybase.io/docs/command_line LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/../LICENSE -USES= cpe go tar:xz +USES= cpe go:modules tar:xz + +USE_GITHUB= yes +GH_ACCOUNT= keybase +GH_PROJECT= client +GO_MODULE= github.com/keybase/client/go +GO_TARGET= ./keybase ./kbfs/kbfsfuse ./kbfs/kbfsgit/git-remote-keybase ./kbfs/kbfstool GO_BUILDFLAGS= -tags production -GO_PKGNAME= github.com/keybase/client/go -GO_TARGET= ${GO_PKGNAME}/keybase ${GO_PKGNAME}/kbfs/kbfsfuse ${GO_PKGNAME}/kbfs/kbfsgit/git-remote-keybase ${GO_PKGNAME}/kbfs/kbfstool -WRKSRC= ${WRKDIR}/client-v${PORTVERSION}/go +WRKSRC_SUBDIR= go PLIST_FILES= bin/git-remote-keybase bin/kbfsfuse bin/kbfstool bin/keybase diff --git a/security/keybase/distinfo b/security/keybase/distinfo index b6f8438f307a..cfda128077d9 100644 --- a/security/keybase/distinfo +++ b/security/keybase/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1654708328 -SHA256 (keybase-v5.8.1.tar.xz) = 5e89792105ce29420e92ebeaf8055db5e7d67de5e181f83f69904356ddeb8c71 -SIZE (keybase-v5.8.1.tar.xz) = 60142348 +TIMESTAMP = 1675622993 +SHA256 (go/security_keybase/keybase-client-v6.0.4_GH0/go.mod) = c1d31be5d590ee197dffea7799c62ca1395fe340c3c8d1e68736e6c4b49446ad +SIZE (go/security_keybase/keybase-client-v6.0.4_GH0/go.mod) = 18849 +SHA256 (go/security_keybase/keybase-client-v6.0.4_GH0/keybase-client-v6.0.4_GH0.tar.gz) = 10f1b0fbee30520091a2005886947e34ea8d0f3dc3197a80563e5eb12664cc59 +SIZE (go/security_keybase/keybase-client-v6.0.4_GH0/keybase-client-v6.0.4_GH0.tar.gz) = 57268878 diff --git a/security/keybase/files/patch-vendor-golang.org-x-sys-unix-ztypes_freebsd_arm64.go b/security/keybase/files/patch-vendor-golang.org-x-sys-unix-ztypes_freebsd_arm64.go deleted file mode 100644 index ba20c450f784..000000000000 --- a/security/keybase/files/patch-vendor-golang.org-x-sys-unix-ztypes_freebsd_arm64.go +++ /dev/null @@ -1,13 +0,0 @@ -Obtained from: https://github.com/golang/sys/commit/33540a1f603772f9d4b761f416f5c10dade23e96 - ---- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig 2020-03-10 17:25:08 UTC -+++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go -@@ -397,7 +397,7 @@ type Reg struct { - } - - type FpReg struct { -- Fp_q [32]uint128 -+ Fp_q [512]uint8 - Fp_sr uint32 - Fp_cr uint32 - }