Attachment 238656 Details for Bug 268142 – git-format-patch

[patch] git-format-patch

0001-Add-new-port-amazon-ssm-plugin-is-a-awscli-plugin-fo.patch (text/plain), 7.26 KB, created by Norikatsu Shigemura on 2022-12-09 02:56:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Norikatsu Shigemura

Created: 2022-12-09 02:56:52 UTC

Size: 7.26 KB

patch

obsolete

>From 6c217f87a023eb46c72dbbb0067c65b19c47a075 Mon Sep 17 00:00:00 2001
>From: Norikatsu Shigemura <nork@ninth-nine.com>
>Date: Fri, 9 Dec 2022 11:53:46 +0900
>Subject: [PATCH] Add new port, amazon-ssm-plugin is a awscli plugin for Amazon
> Session Manger.
>
>---
> sysutils/Makefile                             |  1 +
> sysutils/amazon-ssm-plugin/Makefile           | 56 +++++++++++++++++++
> sysutils/amazon-ssm-plugin/distinfo           |  3 +
> .../files/patch-seelog__unix.xml              | 14 +++++
> .../files/patch-src_log_log__unix.go          | 22 ++++++++
> .../files/patch-src_version_version.go        |  8 +++
> sysutils/amazon-ssm-plugin/pkg-descr          |  7 +++
> 7 files changed, 111 insertions(+)
> create mode 100644 sysutils/amazon-ssm-plugin/Makefile
> create mode 100644 sysutils/amazon-ssm-plugin/distinfo
> create mode 100644 sysutils/amazon-ssm-plugin/files/patch-seelog__unix.xml
> create mode 100644 sysutils/amazon-ssm-plugin/files/patch-src_log_log__unix.go
> create mode 100644 sysutils/amazon-ssm-plugin/files/patch-src_version_version.go
> create mode 100644 sysutils/amazon-ssm-plugin/pkg-descr
>
>diff --git sysutils/Makefile sysutils/Makefile
>index ba48b9d..fd708aba 100644
>--- sysutils/Makefile
>+++ sysutils/Makefile
>@@ -32,6 +32,7 @@
>     SUBDIR += alfio
>     SUBDIR += am-utils
>     SUBDIR += amazon-ssm-agent
>+    SUBDIR += amazon-ssm-plugin
>     SUBDIR += amdmsrtweaker
>     SUBDIR += amrstat
>     SUBDIR += amtc
>diff --git sysutils/amazon-ssm-plugin/Makefile sysutils/amazon-ssm-plugin/Makefile
>new file mode 100644
>index 0000000..a42ecd1
>--- /dev/null
>+++ sysutils/amazon-ssm-plugin/Makefile
>@@ -0,0 +1,56 @@
>+PORTNAME=	amazon-ssm-plugin
>+DISTVERSION=	1.2.398.0
>+CATEGORIES=	sysutils
>+
>+MAINTAINER=	nork@ninth-nine.com
>+COMMENT=	Amazon AWS Manages shell experience using SSM APIs
>+WWW=		https://github.com/aws/session-manager-plugin/
>+
>+LICENSE=	APACHE20
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+RUN_DEPENDS=	aws:devel/py-awscli@${PY_FLAVOR}
>+
>+USES=		go
>+GO_BUILDFLAGS=	-ldflags "-s -w"
>+GO_TARGET=	src/sessionmanagerplugin-main/main.go:${PREFIX}/bin/session-manager-plugin \
>+		src/ssmcli-main/main.go:${PREFIX}/bin/ssmcli
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	aws
>+GH_PROJECT=	session-manager-plugin
>+GH_TAGNAME=	${DISTVERSION}
>+GH_SUBDIR=	${GH_PROJECT}
>+
>+PORTDOCS=	NOTICE README.md RELEASENOTES.md THIRD-PARTY VERSION
>+PLIST_FILES=	${ETCDIR}/sessionmanagerplugin/seelog.xml.template \
>+		${ETCDIR}/SSMCLI/seelog.xml.template \
>+		bin/session-manager-plugin \
>+		bin/ssmcli
>+
>+LOGDIR=		${DESTDIR}/var/log/${PORTNAME}
>+
>+OPTIONS_DEFINE=	DOCS
>+
>+post-extract:
>+	${MKDIR} ${WRKDIR}/src
>+	${LN} -s ${WRKSRC} ${GO_WRKSRC}
>+	${MKDIR} ${WRKSRC}/vendor/src/github.com/aws/session-manager-plugin
>+	${LN} -s ${WRKSRC}/vendor/src/* ${GO_WRKSRC}/vendor/
>+	${LN} -s ${WRKSRC}/src          ${GO_WRKSRC}/vendor/github.com/aws/session-manager-plugin/
>+
>+post-patch:
>+	${REINPLACE_CMD} -e 's|%%VERSION%%|${DISTVERSION}|' ${WRKSRC}/src/version/version.go
>+	${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|g; s|%%LOGDIR%%|${LOGDIR}|g' ${WRKSRC}/seelog_unix.xml
>+	${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|g; s|%%LOGDIR%%|${LOGDIR}|g' ${WRKSRC}/src/log/log_unix.go
>+
>+post-install:
>+	@${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${ETCDIR}/SSMCLI ${STAGEDIR}${ETCDIR}/sessionmanagerplugin
>+	${INSTALL_DATA} ${WRKSRC}/seelog_unix.xml ${STAGEDIR}${ETCDIR}/SSMCLI/seelog.xml.template
>+	${INSTALL_DATA} ${WRKSRC}/seelog_unix.xml ${STAGEDIR}${ETCDIR}/sessionmanagerplugin/seelog.xml.template
>+
>+post-install-DOCS-on:
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
>+
>+.include <bsd.port.mk>
>diff --git sysutils/amazon-ssm-plugin/distinfo sysutils/amazon-ssm-plugin/distinfo
>new file mode 100644
>index 0000000..2374db2
>--- /dev/null
>+++ sysutils/amazon-ssm-plugin/distinfo
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1670092496
>+SHA256 (aws-session-manager-plugin-1.2.398.0_GH0.tar.gz) = 85a511b849f480613b9119f4c800c6ae427b366da463714ade1ccf470de43a99
>+SIZE (aws-session-manager-plugin-1.2.398.0_GH0.tar.gz) = 21657464
>diff --git sysutils/amazon-ssm-plugin/files/patch-seelog__unix.xml sysutils/amazon-ssm-plugin/files/patch-seelog__unix.xml
>new file mode 100644
>index 0000000..4571935
>--- /dev/null
>+++ sysutils/amazon-ssm-plugin/files/patch-seelog__unix.xml
>@@ -0,0 +1,14 @@
>+--- seelog_unix.xml.orig	2021-08-17 20:31:44 UTC
>++++ seelog_unix.xml
>+@@ -6,9 +6,9 @@
>+         <exception filepattern="test*" minlevel="error"/>
>+     </exceptions>
>+     <outputs formatid="fmtinfo">
>+-        <rollingfile type="size" filename="/usr/local/sessionmanagerplugin/logs/session-manager-plugin.log" maxsize="30000000" maxrolls="5"/>
>++        <rollingfile type="size" filename="%%LOGDIR%%/session-manager-plugin.log" maxsize="30000000" maxrolls="5"/>
>+         <filter levels="error,critical" formatid="fmterror">
>+-            <rollingfile type="size" filename="/usr/local/sessionmanagerplugin/logs/errors.log" maxsize="10000000" maxrolls="5"/>
>++            <rollingfile type="size" filename="%%LOGDIR%%/session-manager-plugin-errors.log" maxsize="10000000" maxrolls="5"/>
>+         </filter>
>+     </outputs>
>+     <formats>
>diff --git sysutils/amazon-ssm-plugin/files/patch-src_log_log__unix.go sysutils/amazon-ssm-plugin/files/patch-src_log_log__unix.go
>new file mode 100644
>index 0000000..b31d3f9
>--- /dev/null
>+++ sysutils/amazon-ssm-plugin/files/patch-src_log_log__unix.go
>@@ -0,0 +1,22 @@
>+--- src/log/log_unix.go.orig	2022-06-17 20:08:49 UTC
>++++ src/log/log_unix.go
>+@@ -23,8 +23,8 @@ import (
>+ )
>+ 
>+ const (
>+-	LogsDirectory                = "logs"
>+-	DefaultInstallLocationPrefix = "/usr/local"
>++	DefaultLogsDirectory         = "%%LOGDIR%%"
>++	DefaultInstallLocationPrefix = "%%ETCDIR%%"
>+ )
>+ 
>+ func getApplicationName(clientName string) string {
>+@@ -45,7 +45,7 @@ func getLogConfigBytes(clientName string) (logConfigBy
>+ 
>+ 	applicationName := getApplicationName(clientName)
>+ 	DefaultSeelogConfigFilePath = filepath.Join(DefaultInstallLocationPrefix, applicationName, SeelogConfigFileName)
>+-	DefaultLogDir = filepath.Join(DefaultInstallLocationPrefix, applicationName, LogsDirectory)
>++	DefaultLogDir = filepath.Join(DefaultLogsDirectory, applicationName)
>+ 	ApplicationLogFile = fmt.Sprintf("%s%s", clientName, LogFileExtension)
>+ 	ErrorLogFile = fmt.Sprintf("%s%s", ErrorLogFileSuffix, LogFileExtension)
>+ 	if logConfigBytes, err = ioutil.ReadFile(DefaultSeelogConfigFilePath); err != nil {
>diff --git sysutils/amazon-ssm-plugin/files/patch-src_version_version.go sysutils/amazon-ssm-plugin/files/patch-src_version_version.go
>new file mode 100644
>index 0000000..cf5b8d5
>--- /dev/null
>+++ sysutils/amazon-ssm-plugin/files/patch-src_version_version.go
>@@ -0,0 +1,8 @@
>+--- src/version/version.go.orig	2022-06-17 20:08:49 UTC
>++++ src/version/version.go
>+@@ -9,4 +9,4 @@
>+ package version
>+ 
>+ // Version is the version of the CLI
>+-const Version = "1.2.0.0"
>++const Version = "%%VERSION%%"
>diff --git sysutils/amazon-ssm-plugin/pkg-descr sysutils/amazon-ssm-plugin/pkg-descr
>new file mode 100644
>index 0000000..3c7d2b6
>--- /dev/null
>+++ sysutils/amazon-ssm-plugin/pkg-descr
>@@ -0,0 +1,7 @@
>+This package provides Amazon SSM SessionManager and CLI for managing
>+shell experience using SSM APIs.
>+
>+HOW TO USE:
>+  aws ssm start-session --target "your instance-id"
>+
>+SEE ALSO: https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html
>-- 
>2.38.1
>

Flags:

nork: maintainer-approval+

Actions: View | Diff

Attachments on bug 268142: 238504 | 238656 | 239498 | 239521