Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 May 2017 08:01:16 +0000 (UTC)
From:      Colin Percival <cperciva@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r441899 - in head/sysutils/amazon-ssm-agent: . files
Message-ID:  <201705280801.v4S81Gfk078289@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cperciva
Date: Sun May 28 08:01:16 2017
New Revision: 441899
URL: https://svnweb.freebsd.org/changeset/ports/441899

Log:
  Update Amazon SSM Agent to version 2.0.790.0.
  
  This update does not appear to bring any significant functional changes
  affecting FreeBSD; but some patches from the ports tree have been merged
  upstream so this commit reduces the set of local patches.
  
  This version of the Amazon SSM Agent builds a "ssm-cli" utility.  Since I
  have been unable to determine what this utility does, and it seems to be
  entirely undocumented, it is not being installed.

Deleted:
  head/sysutils/amazon-ssm-agent/files/patch-agent_fileutil_fileutil__unix.go
  head/sysutils/amazon-ssm-agent/files/patch-agent_platform_platform__unix.go
  head/sysutils/amazon-ssm-agent/files/patch-agent_ssm_service.go
Modified:
  head/sysutils/amazon-ssm-agent/Makefile
  head/sysutils/amazon-ssm-agent/distinfo
  head/sysutils/amazon-ssm-agent/files/patch-agent_appconfig_constants__unix.go
  head/sysutils/amazon-ssm-agent/files/patch-makefile

Modified: head/sysutils/amazon-ssm-agent/Makefile
==============================================================================
--- head/sysutils/amazon-ssm-agent/Makefile	Sun May 28 07:22:21 2017	(r441898)
+++ head/sysutils/amazon-ssm-agent/Makefile	Sun May 28 08:01:16 2017	(r441899)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	amazon-ssm-agent
-PORTVERSION=	v1.2.252.0
+PORTVERSION=	2.0.790.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	cperciva@FreeBSD.org

Modified: head/sysutils/amazon-ssm-agent/distinfo
==============================================================================
--- head/sysutils/amazon-ssm-agent/distinfo	Sun May 28 07:22:21 2017	(r441898)
+++ head/sysutils/amazon-ssm-agent/distinfo	Sun May 28 08:01:16 2017	(r441899)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468390545
-SHA256 (aws-amazon-ssm-agent-v1.2.252.0_GH0.tar.gz) = 94e9633eadd0a78e5e1b9071b4f75c238dbbb78761f75d45461f8b0f5a5fbf24
-SIZE (aws-amazon-ssm-agent-v1.2.252.0_GH0.tar.gz) = 4562897
+TIMESTAMP = 1495953791
+SHA256 (aws-amazon-ssm-agent-2.0.790.0_GH0.tar.gz) = e6b5c3f34ccae795bde48f410ed325c1e20ee148eb63a0cfbbaed6a37f212170
+SIZE (aws-amazon-ssm-agent-2.0.790.0_GH0.tar.gz) = 9276985

Modified: head/sysutils/amazon-ssm-agent/files/patch-agent_appconfig_constants__unix.go
==============================================================================
--- head/sysutils/amazon-ssm-agent/files/patch-agent_appconfig_constants__unix.go	Sun May 28 07:22:21 2017	(r441898)
+++ head/sysutils/amazon-ssm-agent/files/patch-agent_appconfig_constants__unix.go	Sun May 28 08:01:16 2017	(r441899)
@@ -1,20 +1,20 @@
---- agent/appconfig/constants_unix.go.orig	2016-07-06 21:51:35 UTC
-+++ agent/appconfig/constants_unix.go
-@@ -18,7 +18,7 @@ package appconfig
+--- agent/appconfig/constants_unix.go.orig	2017-05-22 17:12:08.000000000 +0000
++++ agent/appconfig/constants_unix.go	2017-05-28 06:51:05.792117000 +0000
+@@ -18,7 +18,7 @@
  
  const (
- 	// Program Folder
+ 	// DefaultProgramFolder is the default folder for SSM
 -	DefaultProgramFolder = "/etc/amazon/ssm/"
 +	DefaultProgramFolder = "/usr/local/etc/amazon/ssm/"
  
- 	// AppConfig Path
+ 	// AppConfigPath is the path of the AppConfig
  	AppConfigPath = DefaultProgramFolder + AppConfigFileName
-@@ -27,7 +27,7 @@ const (
+@@ -47,7 +47,7 @@
  	DownloadRoot = "/var/log/amazon/ssm/download/"
  
  	// DefaultDataStorePath represents the directory for storing system data
 -	DefaultDataStorePath = "/var/lib/amazon/ssm/"
 +	DefaultDataStorePath = "/var/run/amazon/ssm/"
  
- 	// UpdaterArtifactsRoot represents the directory for storing update related information
- 	UpdaterArtifactsRoot = "/var/lib/amazon/ssm/update/"
+ 	// EC2ConfigDataStorePath represents the directory for storing ec2 config data
+ 	EC2ConfigDataStorePath = "/var/lib/amazon/ec2config/"

Modified: head/sysutils/amazon-ssm-agent/files/patch-makefile
==============================================================================
--- head/sysutils/amazon-ssm-agent/files/patch-makefile	Sun May 28 07:22:21 2017	(r441898)
+++ head/sysutils/amazon-ssm-agent/files/patch-makefile	Sun May 28 08:01:16 2017	(r441899)
@@ -1,7 +1,7 @@
---- makefile.orig	2016-07-06 21:51:35 UTC
-+++ makefile
-@@ -26,13 +26,15 @@ endif
- export GOPATH
+--- makefile.orig	2017-05-22 17:12:08.000000000 +0000
++++ makefile	2017-05-28 06:54:07.291237000 +0000
+@@ -35,8 +35,10 @@
+ export BRAZIL_BUILD
  
  checkstyle::
 +ifndef SKIP_CHECKSTYLE
@@ -11,22 +11,11 @@
  
  coverage:: build-linux
  	$(BGO_SPACE)/Tools/src/coverage.sh github.com/aws/amazon-ssm-agent/agent/...
+@@ -121,6 +123,14 @@
+ 	GOOS=freebsd GOARCH=amd64 $(GO_BUILD) -ldflags "-s -w" -o $(BGO_SPACE)/bin/freebsd_amd64/ssm-cli -v \
+             $(BGO_SPACE)/agent/cli-main/cli-main.go
  
--build:: build-linux build-windows build-linux-386 build-windows-386
-+build:: build-linux build-freebsd build-windows build-linux-386 build-windows-386
- 
- prepack:: prepack-linux prepack-linux-386 prepack-windows prepack-windows-386
- 
-@@ -75,6 +77,19 @@ build-linux: checkstyle copy-src pre-bui
- 	GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -o $(BGO_SPACE)/bin/linux_amd64/updater -v \
- 	$(BGO_SPACE)/agent/update/updater/updater.go $(BGO_SPACE)/agent/update/updater/updater_unix.go
- 
-+.PHONY: build-freebsd
-+build-freebsd: checkstyle copy-src pre-build
-+	@echo "Build for freebsd agent"
-+	GOOS=freebsd GOARCH=amd64 go build -ldflags "-s -w" -o $(BGO_SPACE)/bin/freebsd_amd64/amazon-ssm-agent -v \
-+	$(BGO_SPACE)/agent/agent.go $(BGO_SPACE)/agent/agent_unix.go $(BGO_SPACE)/agent/agent_parser.go
-+
++.PHONY: install-freebsd
 +install-freebsd:
 +	@echo "Install for freebsd agent"
 +	install -m 555 $(BGO_SPACE)/bin/freebsd_amd64/amazon-ssm-agent $(DESTDIR)$(PREFIX)/sbin/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705280801.v4S81Gfk078289>