From bd04ac9a1992d3a0ae638fe7d5c72e32065b6f8b Mon Sep 17 00:00:00 2001
From: Sam Salisbury <samsalisbury@gmail.com>
Date: Tue, 6 Oct 2020 19:59:14 +0100
Subject: [PATCH] packagespec upgrade -version 0.1.5 (#547)

---
 packages-oss.lock/Makefile  | 5 +++--
 packages-oss.lock/config.mk | 3 ++-
 packages-oss.lock/pkgs.yml  | 7 +++++--
 packagespec.mk              | 5 +++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages-oss.lock/Makefile b/packages-oss.lock/Makefile
index 78c2d88d70..31f12766f5 100755
--- a/packages-oss.lock/Makefile
+++ b/packages-oss.lock/Makefile
@@ -257,13 +257,14 @@ endef
 # RELEASE_TARGETS are targets in the release repo we pass control to
 # to perform release actions.
 # Note: The release repo is only available to HashiCorp employees.
-RELEASE_TARGETS := build-ci stage-config stage
+RELEASE_TARGETS := build-ci stage-config stage custom-build custom-build-config
 
 # We always rev-parse the PRODUCT_REVISION to obtain the full SHA. This is required
 # for downstream processes which use it to determine part of the package name.
 $(RELEASE_TARGETS): PRODUCT_REVISION := $(shell git rev-parse $${PRODUCT_REVISION:-HEAD})
 $(RELEASE_TARGETS): PRODUCT_VERSION ?= 0.0.0-$(USER)-snapshot
 $(RELEASE_TARGETS): RELEASE_SYSTEM_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
+custom-build: PRODUCT_VERSION := $(PRODUCT_VERSION)-$(PRODUCT_REVISION)
 $(RELEASE_TARGETS):
 	@\
 		$(call REQUIRE_EXPORT,PRODUCT_REVISION PRODUCT_VERSION) \
@@ -271,7 +272,7 @@ $(RELEASE_TARGETS):
 
 # QUERY_TARGETS are targets in the release repo that perform queries, and are therefore
 # not necessarily bound to a specific PRODUCT_VERSION or PRODUCT_REVISION.
-QUERY_TARGETS := list-staged-builds watch-ci
+QUERY_TARGETS := list-staged-builds list-custom-builds watch-ci
 
 $(QUERY_TARGETS): RELEASE_SYSTEM_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
 $(QUERY_TARGETS):
diff --git a/packages-oss.lock/config.mk b/packages-oss.lock/config.mk
index 4c422814bb..58112771e3 100755
--- a/packages-oss.lock/config.mk
+++ b/packages-oss.lock/config.mk
@@ -190,8 +190,9 @@ BREW_TOOLS := gln:coreutils gtouch:coreutils gstat:coreutils \
 $(eval $(call REQ_TOOLS,brew,brew,brew install,$(BREW_TOOLS)))
 else
 # If not mac, try to install using apt.
+SUDO := $(shell which sudo 2>/dev/null || true)
 APT_TOOLS := pip3:python3-pip jq:jq column:bsdmainutils
-$(eval $(call REQ_TOOLS,apt,apt-get,sudo apt-get update && sudo apt-get install -y,$(APT_TOOLS)))
+$(eval $(call REQ_TOOLS,apt,apt-get,$(SUDO) apt-get update && $(SUDO) apt-get install -y,$(APT_TOOLS)))
 PIP_TOOLS := yq:yq
 $(eval $(call REQ_TOOLS,pip,pip3,pip3 install,$(PIP_TOOLS)))
 
diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml
index 4fc79e059b..34fd2ebdcc 100644
--- a/packages-oss.lock/pkgs.yml
+++ b/packages-oss.lock/pkgs.yml
@@ -1,8 +1,8 @@
 # ***
 # WARNING: Do not EDIT or MERGE this file, it is generated by packagespec.
 # ***
-lockid: e4376ac9df46687f
-packagespec-version: 0.1.3
+lockid: a2761b50710b0c29
+packagespec-version: 0.1.5
 cache-version: 8
 packages:
 - packagespecid: 0f13a5db9132c9350b00e8f221a982e8395b69b4
@@ -35,6 +35,7 @@ packages:
         name: 00-base-aac1d959b4b3af1495941602b5e51fb6181baded
         archive: .buildcache/archives/00-base-aac1d959b4b3af1495941602b5e51fb6181baded.tar.gz
       PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-0f13a5db9132c9350b00e8f221a982e8395b69b4
+      POST_PROCESSORS: apple-notarize av-scan
     circleci:
       BUILDER_CACHE_KEY_PREFIX_LIST:
       - copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}}
@@ -83,6 +84,7 @@ packages:
         name: 00-base-aac1d959b4b3af1495941602b5e51fb6181baded
         archive: .buildcache/archives/00-base-aac1d959b4b3af1495941602b5e51fb6181baded.tar.gz
       PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-1a93ce0fa57be896594a31ad452b1f492727c915
+      POST_PROCESSORS: av-scan
     circleci:
       BUILDER_CACHE_KEY_PREFIX_LIST:
       - copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}}
@@ -131,6 +133,7 @@ packages:
         name: 00-base-aac1d959b4b3af1495941602b5e51fb6181baded
         archive: .buildcache/archives/00-base-aac1d959b4b3af1495941602b5e51fb6181baded.tar.gz
       PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-7c03e0434a3d1cb97495af4e5db40c716584dd5e
+      POST_PROCESSORS: microsoft-notarize av-scan
     circleci:
       BUILDER_CACHE_KEY_PREFIX_LIST:
       - copy-source_33b2_{{checksum ".buildcache/cache-keys/copy-source-33b2efc628fbbe13613a0fb6a2770ed00b4f5691"}}
diff --git a/packagespec.mk b/packagespec.mk
index f1b1fe0860..6ef94fc916 100755
--- a/packagespec.mk
+++ b/packagespec.mk
@@ -43,7 +43,8 @@ PASSTHROUGH_TARGETS := \
 	build package-contents copy-package-contents build-all \
 	aliases meta package package-meta \
 	build-ci watch-ci \
-	stage-config stage \
+	stage-config stage custom-build custom-build-config\
+	list-custom-builds \
 	list-staged-builds \
 	publish-config publish
 
@@ -66,7 +67,7 @@ packages:
 		echo "Note: packagespec is only available to HashiCorp employees at present."; \
 		exit 1; \
 	}
-	@packagespec lock -specfile $(SPEC) -lockdir $(LOCKDIR)
+	@packagespec lock
 	@$(MAKE) $(PACKAGESPEC_CIRCLECI_CONFIG)
 
 CIRCLECI_PRIMARY_TPL := .packagespec/templates/circleci-primary.yml.tpl