Update to amazon-ssm-agent-2.2.493.0.

This commit is contained in:
ajacoutot 2018-04-27 08:02:47 +00:00
parent aae3576beb
commit 46a6217728
4 changed files with 31 additions and 16 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.29 2018/04/14 23:01:01 sthen Exp $
# $OpenBSD: Makefile,v 1.30 2018/04/27 08:02:47 ajacoutot Exp $
COMMENT= AWS SSM agent
GH_TAGNAME= 2.2.392.0
GH_TAGNAME= 2.2.493.0
GH_ACCOUNT= aws
GH_PROJECT= amazon-ssm-agent
REVISION= 0
CATEGORIES= sysutils

View File

@ -1,2 +1,2 @@
SHA256 (amazon-ssm-agent-2.2.392.0.tar.gz) = iIrZpWRVrbrTvWPPEAEmP+xzIBwCiJ+z1i+LHIKWQdM=
SIZE (amazon-ssm-agent-2.2.392.0.tar.gz) = 16775317
SHA256 (amazon-ssm-agent-2.2.493.0.tar.gz) = jZ8PGl3u7CcguVXB6d//CvmEZcGhpDyM/mJgSAsfd2U=
SIZE (amazon-ssm-agent-2.2.493.0.tar.gz) = 16776879

View File

@ -1,16 +1,9 @@
$OpenBSD: patch-agent_appconfig_constants_unix_go,v 1.4 2018/01/20 11:27:34 ajacoutot Exp $
$OpenBSD: patch-agent_appconfig_constants_unix_go,v 1.5 2018/04/27 08:02:47 ajacoutot Exp $
Index: agent/appconfig/constants_unix.go
--- agent/appconfig/constants_unix.go.orig
+++ agent/appconfig/constants_unix.go
@@ -20,55 +20,55 @@ import "os"
@@ -21,49 +21,49 @@ import "os"
const (
// DefaultProgramFolder is the default folder for SSM
- DefaultProgramFolder = "/etc/amazon/ssm/"
+ DefaultProgramFolder = "${SYSCONFDIR}/amazon/ssm/"
// AppConfigPath is the path of the AppConfig
AppConfigPath = DefaultProgramFolder + AppConfigFileName
// PackageRoot specifies the directory under which packages will be downloaded and installed
- PackageRoot = "/var/lib/amazon/ssm/packages"
@ -72,3 +65,26 @@ Index: agent/appconfig/constants_unix.go
// List all plugin names, unfortunately golang doesn't support const arrays of strings
@@ -90,8 +90,8 @@ const (
var PowerShellPluginCommandName string
// DefaultProgramFolder is the default folder for SSM
-var DefaultProgramFolder = "/etc/amazon/ssm/"
-var DefaultDocumentWorker = "/usr/bin/ssm-document-worker"
+var DefaultProgramFolder = "${SYSCONFDIR}/amazon/ssm/"
+var DefaultDocumentWorker = "${LOCALBASE}/bin/ssm-document-worker"
// AppConfigPath is the path of the AppConfig
var AppConfigPath = DefaultProgramFolder + AppConfigFileName
@@ -100,9 +100,9 @@ func init() {
/*
Powershell command used to be poweshell in alpha versions, now it's pwsh in prod versions
*/
- PowerShellPluginCommandName = "/usr/bin/powershell"
+ PowerShellPluginCommandName = "${LOCALBASE}/bin/powershell"
if _, err := os.Stat(PowerShellPluginCommandName); err != nil {
- 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 {

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-makefile,v 1.5 2017/09/15 07:20:56 ajacoutot Exp $
$OpenBSD: patch-makefile,v 1.6 2018/04/27 08:02:47 ajacoutot Exp $
Index: makefile
--- makefile.orig
+++ makefile
@ -15,7 +15,7 @@ Index: makefile
-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
prepack:: cpy-plugins prepack-linux prepack-linux-386 prepack-windows prepack-windows-386 prepack-arm
prepack:: cpy-plugins prepack-linux prepack-linux-386 prepack-windows prepack-windows-386
@@ -126,6 +126,22 @@ build-freebsd: checkstyle copy-src pre-build
$(BGO_SPACE)/agent/cli-main/cli-main.go