Index: head/sysutils/amazon-ssm-agent/Makefile
===================================================================
--- head/sysutils/amazon-ssm-agent/Makefile	(revision 501758)
+++ head/sysutils/amazon-ssm-agent/Makefile	(revision 501759)
@@ -1,39 +1,61 @@
 # $FreeBSD$
 
 PORTNAME=	amazon-ssm-agent
-PORTVERSION=	2.0.790.0
-PORTREVISION=	1
+PORTVERSION=	2.3.612.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	cperciva@FreeBSD.org
 COMMENT=	Amazon Simple Systems Manager Agent
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	go:lang/go
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	aws
 GH_SUBDIR=	src/github.com/aws/amazon-ssm-agent
 
 PLIST_FILES=	etc/amazon/ssm/amazon-ssm-agent.json.template	\
 		etc/amazon/ssm/seelog_unix.xml.template		\
-		sbin/amazon-ssm-agent
+		sbin/amazon-ssm-agent				\
+		sbin/ssm-document-worker			\
+		sbin/ssm-session-worker				\
+		sbin/ssm-session-logger				\
+		sbin/ssm-cli
 
 USE_RC_SUBR=	amazon-ssm-agent
 
 do-build:
 	@cd ${WRKSRC};							\
 	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
-	    go build -ldflags "-s -w" -o amazon-ssm-agent		\
-	    agent/agent.go agent/agent_unix.go agent/agent_parser.go
+	    go build -ldflags "-s -w" -o amazon-ssm-agent -v 				\
+		agent/agent.go agent/agent_unix.go agent/agent_parser.go
+	@cd ${WRKSRC};							\
+	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
+	    go build -ldflags "-s -w" -o ssm-document-worker -v				\
+		agent/framework/processor/executer/outofproc/worker/main.go
+	@cd ${WRKSRC};							\
+	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
+	    go build -ldflags "-s -w" -o ssm-session-worker -v				\
+		agent/framework/processor/executer/outofproc/sessionworker/main.go
+	@cd ${WRKSRC};							\
+	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
+	    go build -ldflags "-s -w" -o ssm-session-logger -v				\
+		agent/session/logging/main.go
+	@cd ${WRKSRC};							\
+	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
+	    go build -ldflags "-s -w" -o ssm-cli -v agent/cli-main/cli-main.go
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/amazon-ssm-agent ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/ssm-document-worker ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/ssm-session-worker ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/ssm-session-logger ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/ssm-cli ${STAGEDIR}${PREFIX}/sbin
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/amazon/ssm
 	${INSTALL_DATA} ${WRKSRC}/amazon-ssm-agent.json.template ${STAGEDIR}${PREFIX}/etc/amazon/ssm
 	${INSTALL_DATA} ${WRKSRC}/seelog_unix.xml ${STAGEDIR}${PREFIX}/etc/amazon/ssm/seelog_unix.xml.template
 
 .include <bsd.port.mk>
Index: head/sysutils/amazon-ssm-agent/distinfo
===================================================================
--- head/sysutils/amazon-ssm-agent/distinfo	(revision 501758)
+++ head/sysutils/amazon-ssm-agent/distinfo	(revision 501759)
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1557465201
+SHA256 (aws-amazon-ssm-agent-2.3.612.0_GH0.tar.gz) = 297937404da04e52adbe92a767f2aa11ae03b4fd61c112a6fac793a5fae40ff4
+SIZE (aws-amazon-ssm-agent-2.3.612.0_GH0.tar.gz) = 16975913
Index: head/sysutils/amazon-ssm-agent/files/patch-agent_appconfig_constants__unix.go
===================================================================
--- head/sysutils/amazon-ssm-agent/files/patch-agent_appconfig_constants__unix.go	(revision 501758)
+++ head/sysutils/amazon-ssm-agent/files/patch-agent_appconfig_constants__unix.go	(revision 501759)
@@ -1,20 +1,20 @@
---- 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 (
- 	// DefaultProgramFolder is the default folder for SSM
--	DefaultProgramFolder = "/etc/amazon/ssm/"
-+	DefaultProgramFolder = "/usr/local/etc/amazon/ssm/"
- 
- 	// AppConfigPath is the path of the AppConfig
- 	AppConfigPath = DefaultProgramFolder + AppConfigFileName
-@@ -47,7 +47,7 @@
+--- agent/appconfig/constants_unix.go.orig	2019-05-08 20:19:03 UTC
++++ agent/appconfig/constants_unix.go
+@@ -53,7 +53,7 @@ const (
  	DownloadRoot = "/var/log/amazon/ssm/download/"
  
  	// DefaultDataStorePath represents the directory for storing system data
 -	DefaultDataStorePath = "/var/lib/amazon/ssm/"
 +	DefaultDataStorePath = "/var/run/amazon/ssm/"
  
  	// EC2ConfigDataStorePath represents the directory for storing ec2 config data
  	EC2ConfigDataStorePath = "/var/lib/amazon/ec2config/"
+@@ -95,7 +95,7 @@ const (
+ var PowerShellPluginCommandName string
+ 
+ // DefaultProgramFolder is the default folder for SSM
+-var DefaultProgramFolder = "/etc/amazon/ssm/"
++var DefaultProgramFolder = "/usr/local/etc/amazon/ssm/"
+ var DefaultDocumentWorker = "/usr/bin/ssm-document-worker"
+ var DefaultSessionWorker = "/usr/bin/ssm-session-worker"
+ var DefaultSessionLogger = "/usr/bin/ssm-session-logger"
Index: head/sysutils/amazon-ssm-agent/files/patch-agent_log_log__unix.go
===================================================================
--- head/sysutils/amazon-ssm-agent/files/patch-agent_log_log__unix.go	(revision 501758)
+++ head/sysutils/amazon-ssm-agent/files/patch-agent_log_log__unix.go	(revision 501759)
@@ -1,11 +1,11 @@
---- agent/log/log_unix.go.orig	2016-07-06 21:51:35 UTC
+--- agent/log/log_unix.go.orig	2019-05-08 20:19:03 UTC
 +++ agent/log/log_unix.go
 @@ -24,7 +24,7 @@ const (
  	// DefaultSeelogConfigFilePath specifies the default seelog location
  	// The underlying logger is based of https://github.com/cihub/seelog
  	// See Seelog documentation to customize the logger
 -	DefaultSeelogConfigFilePath = "/etc/amazon/ssm/seelog.xml"
 +	DefaultSeelogConfigFilePath = "/usr/local/etc/amazon/ssm/seelog.xml"
  
  	DefaultLogDir = "/var/log/amazon/ssm"
  )
Index: head/sysutils/amazon-ssm-agent/files/patch-agent_session_utility_utility__unix.go
===================================================================
--- head/sysutils/amazon-ssm-agent/files/patch-agent_session_utility_utility__unix.go	(nonexistent)
+++ head/sysutils/amazon-ssm-agent/files/patch-agent_session_utility_utility__unix.go	(revision 501759)
@@ -0,0 +1,11 @@
+--- agent/session/utility/utility_unix.go.orig	2019-05-15 22:56:33 UTC
++++ agent/session/utility/utility_unix.go
+@@ -65,7 +65,7 @@ func (u *SessionUtil) CreateLocalAdminUser(log log.T) 
+ 		}
+ 	}
+ 
+-	err = u.createSudoersFileIfNotPresent(log)
++	err = nil
+ 	return
+ }
+ 

Property changes on: head/sysutils/amazon-ssm-agent/files/patch-agent_session_utility_utility__unix.go
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/amazon-ssm-agent/files/patch-agent_version_version.go
===================================================================
--- head/sysutils/amazon-ssm-agent/files/patch-agent_version_version.go	(nonexistent)
+++ head/sysutils/amazon-ssm-agent/files/patch-agent_version_version.go	(revision 501759)
@@ -0,0 +1,8 @@
+--- agent/version/version.go.orig	2019-05-08 20:19:03 UTC
++++ agent/version/version.go
+@@ -19,4 +19,4 @@
+ package version
+ 
+ // Version is the version of the Agent
+-const Version = "2.3.0.0"
++const Version = "2.3.612.0"

Property changes on: head/sysutils/amazon-ssm-agent/files/patch-agent_version_version.go
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/amazon-ssm-agent/pkg-deinstall
===================================================================
--- head/sysutils/amazon-ssm-agent/pkg-deinstall	(nonexistent)
+++ head/sysutils/amazon-ssm-agent/pkg-deinstall	(revision 501759)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ "$2" = "DEINSTALL" ]; then
+	echo "Removing ssm-user"
+	pw userdel ssm-user -r
+fi

Property changes on: head/sysutils/amazon-ssm-agent/pkg-deinstall
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/amazon-ssm-agent/pkg-install
===================================================================
--- head/sysutils/amazon-ssm-agent/pkg-install	(nonexistent)
+++ head/sysutils/amazon-ssm-agent/pkg-install	(revision 501759)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ "$2" = "POST-INSTALL" ]; then
+	echo "Creating ssm-user for SSM Agent Sessions"
+	pw useradd ssm-user -G wheel -m
+fi

Property changes on: head/sysutils/amazon-ssm-agent/pkg-install
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property