From owner-svn-ports-all@freebsd.org Tue Aug 25 18:45:35 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A2EF63B67DF; Tue, 25 Aug 2020 18:45:35 +0000 (UTC) (envelope-from swills@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BbdGl3r3kz3dG9; Tue, 25 Aug 2020 18:45:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D7D42DFEE; Tue, 25 Aug 2020 18:45:35 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07PIjZ5q054290; Tue, 25 Aug 2020 18:45:35 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07PIjYfr054284; Tue, 25 Aug 2020 18:45:34 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202008251845.07PIjYfr054284@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 25 Aug 2020 18:45:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546207 - in head/security/vault: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/security/vault: . files X-SVN-Commit-Revision: 546207 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Aug 2020 18:45:35 -0000 Author: swills Date: Tue Aug 25 18:45:34 2020 New Revision: 546207 URL: https://svnweb.freebsd.org/changeset/ports/546207 Log: security/vault: update to 1.5.2 Added: head/security/vault/files/patch-go.mod (contents, props changed) head/security/vault/files/patch-vendor_modules.txt (contents, props changed) Modified: head/security/vault/Makefile (contents, props changed) head/security/vault/distinfo (contents, props changed) Modified: head/security/vault/Makefile ============================================================================== --- head/security/vault/Makefile Tue Aug 25 18:44:16 2020 (r546206) +++ head/security/vault/Makefile Tue Aug 25 18:45:34 2020 (r546207) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= vault -PORTVERSION= 1.5.0 +PORTVERSION= 1.5.2 DISTVERSIONPREFIX= v CATEGORIES= security @@ -15,15 +15,17 @@ USES= go:modules USE_GITHUB= yes GH_TUPLE= hashicorp:${PORTNAME}:${VAULTTAG}:DEFAULT \ - swills:vaultui:${VAULTUITAG}:vaultui + swills:vaultui:${VAULTUITAG}:vaultui \ + hashicorp:vault-plugin-auth-gcp:07ff53341dfe:hashicorp_vault_plugin_auth_gcp GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} +COMMIT_ID= 685fdfa GO_BUILDFLAGS= -tags=ui \ -ldflags="\ - -X github.com/hashicorp/vault/version.Version=${PORTVERSION} \ - -X github.com/hashicorp/vault/version.VersionPrerelease= \ - -X github.com/hashicorp/vault/version.VersionMetadata= \ - -X github.com/hashicorp/vault/version.GitCommit='${COMMIT_ID}'" + -X github.com/hashicorp/vault/sdk/version.Version=${PORTVERSION} \ + -X github.com/hashicorp/vault/sdk/version.VersionPrerelease= \ + -X github.com/hashicorp/vault/sdk/version.VersionMetadata= \ + -X github.com/hashicorp/vault/sdk/version.GitCommit='${COMMIT_ID}'" VAULTTAG= ${DISTVERSIONPREFIX}${PORTVERSION} VAULTUITAG= ${DISTVERSIONPREFIX}${PORTVERSION} @@ -40,5 +42,7 @@ PORTSCOUT= limit:^(v?)[0-9]+\.[0-9]+\.[0-9]+$ post-patch: @${CP} ${WRKDIR}/vaultui-${PORTVERSION}/http/bindata_assetfs.go ${WRKDIR}/vault-${PORTVERSION}/http/bindata_assetfs.go + @${RM} -r ${WRKSRC}/vendor/github.com/hashicorp/vault-plugin-auth-gcp + @${MV} ${WRKSRC_hashicorp_vault_plugin_auth_gcp} ${WRKSRC}/vendor/github.com/hashicorp/vault-plugin-auth-gcp .include Modified: head/security/vault/distinfo ============================================================================== --- head/security/vault/distinfo Tue Aug 25 18:44:16 2020 (r546206) +++ head/security/vault/distinfo Tue Aug 25 18:45:34 2020 (r546207) @@ -1,5 +1,7 @@ -TIMESTAMP = 1595557701 -SHA256 (hashicorp-vault-v1.5.0_GH0.tar.gz) = c4e4d8e678ece9f7faa2bd17674b5a18661e78045dba9a3b506e3d8a7499f09b -SIZE (hashicorp-vault-v1.5.0_GH0.tar.gz) = 34940170 -SHA256 (swills-vaultui-v1.5.0_GH0.tar.gz) = 577dace71bd765a8a15b361eb6a308599c0c36a6be14140744b80a4a07a09c13 -SIZE (swills-vaultui-v1.5.0_GH0.tar.gz) = 1613926 +TIMESTAMP = 1598377568 +SHA256 (hashicorp-vault-v1.5.2_GH0.tar.gz) = b1f96830b27a8717cab2b80a21bfb62ac928249b9ef359b4796a0eb426e2dfbe +SIZE (hashicorp-vault-v1.5.2_GH0.tar.gz) = 35118624 +SHA256 (swills-vaultui-v1.5.2_GH0.tar.gz) = 9981f980a4a547e305acd49c3031f1e622b5cdd85dab55cba4375e2b30926c8d +SIZE (swills-vaultui-v1.5.2_GH0.tar.gz) = 1614180 +SHA256 (hashicorp-vault-plugin-auth-gcp-07ff53341dfe_GH0.tar.gz) = ae515d604c7aba64e4c4409b19a397fde4d73880ca69808695521bd2a43e9746 +SIZE (hashicorp-vault-plugin-auth-gcp-07ff53341dfe_GH0.tar.gz) = 3505128 Added: head/security/vault/files/patch-go.mod ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/vault/files/patch-go.mod Tue Aug 25 18:45:34 2020 (r546207) @@ -0,0 +1,20 @@ +--- go.mod.orig 2020-08-25 17:39:09 UTC ++++ go.mod +@@ -6,8 +6,6 @@ replace github.com/hashicorp/vault/api => ./api + + replace github.com/hashicorp/vault/sdk => ./sdk + +-replace github.com/hashicorp/vault-plugin-auth-gcp => github.com/hashicorp/vault-plugin-auth-gcpent v0.0.0-20200721115240-07ff53341dfe +- + require ( + cloud.google.com/go v0.56.0 + cloud.google.com/go/spanner v1.5.1 +@@ -71,7 +69,7 @@ require ( + github.com/hashicorp/vault-plugin-auth-azure v0.5.6 + github.com/hashicorp/vault-plugin-auth-centrify v0.5.5 + github.com/hashicorp/vault-plugin-auth-cf v0.5.4 +- github.com/hashicorp/vault-plugin-auth-gcp v0.7.0 ++ github.com/hashicorp/vault-plugin-auth-gcp v0.7.1-0.20200721115240-07ff53341dfe + github.com/hashicorp/vault-plugin-auth-jwt v0.7.3 + github.com/hashicorp/vault-plugin-auth-kerberos v0.1.6 + github.com/hashicorp/vault-plugin-auth-kubernetes v0.7.0 Added: head/security/vault/files/patch-vendor_modules.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/vault/files/patch-vendor_modules.txt Tue Aug 25 18:45:34 2020 (r546207) @@ -0,0 +1,11 @@ +--- vendor/modules.txt.orig 2020-08-25 17:50:07 UTC ++++ vendor/modules.txt +@@ -458,7 +458,7 @@ github.com/hashicorp/vault-plugin-auth-cf/signatures + github.com/hashicorp/vault-plugin-auth-cf/testing/certificates + github.com/hashicorp/vault-plugin-auth-cf/testing/cf + github.com/hashicorp/vault-plugin-auth-cf/util +-# github.com/hashicorp/vault-plugin-auth-gcp v0.7.0 => github.com/hashicorp/vault-plugin-auth-gcpent v0.0.0-20200721115240-07ff53341dfe ++# github.com/hashicorp/vault-plugin-auth-gcp v0.7.1-0.20200721115240-07ff53341dfe + github.com/hashicorp/vault-plugin-auth-gcp/plugin + github.com/hashicorp/vault-plugin-auth-gcp/plugin/cache + # github.com/hashicorp/vault-plugin-auth-jwt v0.7.3