diff --git a/sysutils/amazon-ssm-agent/Makefile b/sysutils/amazon-ssm-agent/Makefile index 24a928b8db0..ca7774a4f9a 100644 --- a/sysutils/amazon-ssm-agent/Makefile +++ b/sysutils/amazon-ssm-agent/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.34 2018/06/28 08:19:23 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.35 2018/08/13 14:25:50 ajacoutot Exp $ COMMENT= AWS SSM agent -GH_TAGNAME= 2.2.800.0 +GH_TAGNAME= 2.2.916.0 GH_ACCOUNT= aws GH_PROJECT= amazon-ssm-agent diff --git a/sysutils/amazon-ssm-agent/distinfo b/sysutils/amazon-ssm-agent/distinfo index a4216f8e2c4..93162386416 100644 --- a/sysutils/amazon-ssm-agent/distinfo +++ b/sysutils/amazon-ssm-agent/distinfo @@ -1,2 +1,2 @@ -SHA256 (amazon-ssm-agent-2.2.800.0.tar.gz) = VoYTG9n4OyZNeAk0ZfZU3ngQrgY6qAujUHUe+lf2szU= -SIZE (amazon-ssm-agent-2.2.800.0.tar.gz) = 16785930 +SHA256 (amazon-ssm-agent-2.2.916.0.tar.gz) = ctVaadSIl69BNa1wvVFpunw/riu0NPTL2AWNcbUpFN8= +SIZE (amazon-ssm-agent-2.2.916.0.tar.gz) = 16803351 diff --git a/sysutils/amazon-ssm-agent/patches/patch-agent_appconfig_constants_unix_go b/sysutils/amazon-ssm-agent/patches/patch-agent_appconfig_constants_unix_go index fbf87bede70..cb09fd09d2d 100644 --- a/sysutils/amazon-ssm-agent/patches/patch-agent_appconfig_constants_unix_go +++ b/sysutils/amazon-ssm-agent/patches/patch-agent_appconfig_constants_unix_go @@ -1,9 +1,9 @@ -$OpenBSD: patch-agent_appconfig_constants_unix_go,v 1.6 2018/06/28 08:19:23 ajacoutot Exp $ +$OpenBSD: patch-agent_appconfig_constants_unix_go,v 1.7 2018/08/13 14:25:50 ajacoutot Exp $ Index: agent/appconfig/constants_unix.go --- agent/appconfig/constants_unix.go.orig +++ agent/appconfig/constants_unix.go -@@ -21,49 +21,49 @@ import "os" +@@ -23,49 +23,49 @@ import ( const ( // PackageRoot specifies the directory under which packages will be downloaded and installed @@ -66,7 +66,7 @@ Index: agent/appconfig/constants_unix.go // List all plugin names, unfortunately golang doesn't support const arrays of strings -@@ -90,8 +90,8 @@ const ( +@@ -92,8 +92,8 @@ const ( var PowerShellPluginCommandName string // DefaultProgramFolder is the default folder for SSM @@ -77,7 +77,7 @@ Index: agent/appconfig/constants_unix.go // AppConfigPath is the path of the AppConfig var AppConfigPath = DefaultProgramFolder + AppConfigFileName -@@ -100,9 +100,9 @@ func init() { +@@ -102,9 +102,9 @@ func init() { /* Powershell command used to be poweshell in alpha versions, now it's pwsh in prod versions */ @@ -87,5 +87,5 @@ Index: agent/appconfig/constants_unix.go - PowerShellPluginCommandName = "/usr/bin/pwsh" + PowerShellPluginCommandName = "${LOCALBASE}/bin/pwsh" } + // if document-worker is not in the default location, try using the snap installed location - if _, err := os.Stat(DefaultDocumentWorker); err != nil { diff --git a/sysutils/amazon-ssm-agent/patches/patch-makefile b/sysutils/amazon-ssm-agent/patches/patch-makefile index f1c91cf34b2..31e4b3160bd 100644 --- a/sysutils/amazon-ssm-agent/patches/patch-makefile +++ b/sysutils/amazon-ssm-agent/patches/patch-makefile @@ -1,9 +1,9 @@ -$OpenBSD: patch-makefile,v 1.7 2018/06/28 08:19:23 ajacoutot Exp $ +$OpenBSD: patch-makefile,v 1.8 2018/08/13 14:25:50 ajacoutot Exp $ Index: makefile --- makefile.orig +++ makefile -@@ -36,12 +36,12 @@ export BRAZIL_BUILD +@@ -42,12 +42,12 @@ export BRAZIL_BUILD checkstyle:: # Run checkstyle script @@ -13,12 +13,12 @@ Index: makefile coverage:: build-linux $(BGO_SPACE)/Tools/src/coverage.sh github.com/aws/amazon-ssm-agent/agent/... --build:: build-linux build-freebsd build-windows build-linux-386 build-windows-386 build-arm -+build:: build-linux build-freebsd build-openbsd build-windows build-linux-386 build-windows-386 build-arm +-build:: build-linux build-freebsd build-windows build-linux-386 build-windows-386 build-arm build-darwin ++build:: build-linux build-freebsd build-openbsd build-windows build-linux-386 build-windows-386 build-arm build-darwin prepack:: cpy-plugins prepack-linux prepack-linux-386 prepack-windows prepack-windows-386 -@@ -142,6 +142,22 @@ build-freebsd: checkstyle copy-src pre-build +@@ -154,6 +154,22 @@ build-freebsd: checkstyle copy-src pre-build $(BGO_SPACE)/agent/cli-main/cli-main.go GOOS=freebsd GOARCH=amd64 $(GO_BUILD) -ldflags "-s -w" -o $(BGO_SPACE)/bin/freebsd_amd64/ssm-document-worker -v \ $(BGO_SPACE)/agent/framework/processor/executer/outofproc/worker/main.go @@ -41,3 +41,10 @@ Index: makefile .PHONY: build-darwin build-darwin: checkstyle copy-src pre-build +@@ -389,4 +405,4 @@ else + @echo "Start generating mocks in directory" $(MOCKERYDIR) + endif + mockery -name="[A-Z]*" -dir=$(MOCKERYDIR) -output=mocks +- mv mocks $(MOCKERYDIR)/mocks +\ No newline at end of file ++ mv mocks $(MOCKERYDIR)/mocks