Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Nov 2024 16:49:37 GMT
From:      Norikatsu Shigemura <nork@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 4dd0bdb22a27 - main - sysutils/amazon-ssm-plugin: Update to 1.2.694.0
Message-ID:  <202411221649.4AMGnbko067098@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by nork:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4dd0bdb22a27e054135c3461dc1897fbee488ccf

commit 4dd0bdb22a27e054135c3461dc1897fbee488ccf
Author:     Norikatsu Shigemura <nork@FreeBSD.org>
AuthorDate: 2024-11-22 16:48:57 +0000
Commit:     Norikatsu Shigemura <nork@FreeBSD.org>
CommitDate: 2024-11-22 16:48:57 +0000

    sysutils/amazon-ssm-plugin: Update to 1.2.694.0
    
    - update go modules
    - portclippy/portfmt happy
    - clean up vendor modules for safe build
    
    Approved by:    hrs (mentor, blanket)
---
 sysutils/amazon-ssm-plugin/Makefile | 37 ++++++++++++++++++++-----------------
 sysutils/amazon-ssm-plugin/distinfo | 20 +++++++++++++-------
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/sysutils/amazon-ssm-plugin/Makefile b/sysutils/amazon-ssm-plugin/Makefile
index dc226933db89..a7d992732a5a 100644
--- a/sysutils/amazon-ssm-plugin/Makefile
+++ b/sysutils/amazon-ssm-plugin/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	amazon-ssm-plugin
-DISTVERSION=	1.2.677.0
+DISTVERSION=	1.2.694.0
 PORTREVISION=	0
 CATEGORIES=	sysutils
 
@@ -13,31 +13,33 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	aws:devel/py-awscli@${PY_FLAVOR}
 
 USES=		go python:env
-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_SUBDIR=	${GH_PROJECT}
-GH_TUPLE=	eiannone:keyboard:6d2a597fd0f1:eiannone_keyboard/vendor/github.com/eiannone/keyboard \
+GH_TUPLE=	aws:aws-sdk-go:v1.54.10:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		eiannone:keyboard:6d2a597fd0f1:eiannone_keyboard/vendor/github.com/eiannone/keyboard \
 		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		gorilla:websocket:e8629af678b7:gorilla_websocket/vendor/github.com/gorilla/websocket \
 		jmespath:go-jmespath:c2b33e8439af:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
-		stretchr:objx:cbeaeb16a013:stretchr_objx/vendor/github.com/stretchr/objx \
-		stretchr:testify:6cb3b85ef5a0:stretchr_testify/vendor/github.com/stretchr/testify \
+		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
+		stretchr:objx:v0.5.2:stretchr_objx/vendor/github.com/stretchr/objx \
+		stretchr:testify:v1.9.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		twinj:uuid:70cac2bcd273:twinj_uuid/vendor/github.com/twinj/uuid \
 		xtaci:smux:09e2c01560df:xtaci_smux/vendor/github.com/xtaci/smux
-#shrinked?#	aws:aws-sdk-go:v1.54.0:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go
 #customized#	cihub:seelog:c510775bb50d:cihub_seelog/vendor/github.com/cihub/seelog
 
-PORTDOCS=	NOTICE README.md RELEASENOTES.md THIRD-PARTY VERSION
+GO_TARGET=	src/sessionmanagerplugin-main/main.go:${PREFIX}/bin/session-manager-plugin \
+		src/ssmcli-main/main.go:${PREFIX}/bin/ssmcli
+GO_BUILDFLAGS=	-ldflags "-s -w"
+
 PLIST_FILES=	${ETCDIR}/sessionmanagerplugin/seelog.xml.template \
 		${ETCDIR}/SSMCLI/seelog.xml.template \
+		'@dir /var/log/amazon-ssm-plugin' \
 		bin/session-manager-plugin \
-		bin/ssmcli \
-		'@dir /var/log/amazon-ssm-plugin'
+		bin/ssmcli
+PORTDOCS=	NOTICE README.md RELEASENOTES.md THIRD-PARTY VERSION
 
 LOGDIR=		${DESTDIR}/var/log/${PORTNAME}
 
@@ -46,11 +48,12 @@ OPTIONS_DEFINE=	DOCS
 post-extract:
 	@${MKDIR} ${WRKDIR}/src
 	@${LN} -s ${WRKSRC} ${GO_WRKSRC}
-	${MKDIR} ${WRKSRC}/vendor/github.com/aws/session-manager-plugin
-	${LN} -s src/golang.org                      ${GO_WRKSRC}/vendor/
-	${LN} -s ../../../../src                     ${GO_WRKSRC}/vendor/github.com/aws/session-manager-plugin/
-	${LN} -s ../src/github.com/cihub             ${GO_WRKSRC}/vendor/github.com/
-	${LN} -s ../../src/github.com/aws/aws-sdk-go ${GO_WRKSRC}/vendor/github.com/aws/
+	${MKDIR}  ${WRKDIR}/src/vendor
+	${MV}     ${WRKSRC}/vendor/github.com           ${WRKDIR}/src/vendor/
+	${LN} -s  ${WRKSRC}/vendor/src/github.com/cihub ${WRKDIR}/src/vendor/github.com/
+	${LN} -s  ${WRKSRC}/vendor/src/golang.org       ${WRKDIR}/src/vendor/
+	${LN} -s  ${WRKSRC}/vendor/src/gopkg.in         ${WRKDIR}/src/vendor/
+	${LN} -s  ${WRKSRC}                             ${WRKDIR}/src/vendor/github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%VERSION%%|${DISTVERSION}|' ${WRKSRC}/src/version/version.go
diff --git a/sysutils/amazon-ssm-plugin/distinfo b/sysutils/amazon-ssm-plugin/distinfo
index a8477bf2a2b8..347d2bc0af83 100644
--- a/sysutils/amazon-ssm-plugin/distinfo
+++ b/sysutils/amazon-ssm-plugin/distinfo
@@ -1,6 +1,10 @@
-TIMESTAMP = 1730179487
-SHA256 (aws-session-manager-plugin-1.2.677.0_GH0.tar.gz) = 381eab5742e6b15c9bc347afc4a308991687f04b6f802161d9c9e63c7e03b58e
-SIZE (aws-session-manager-plugin-1.2.677.0_GH0.tar.gz) = 35309456
+TIMESTAMP = 1732179764
+SHA256 (aws-session-manager-plugin-1.2.694.0_GH0.tar.gz) = 55df529d380a74adc1fce536cbd32f6938be18d8536d683d20d657307ade9589
+SIZE (aws-session-manager-plugin-1.2.694.0_GH0.tar.gz) = 35491825
+SHA256 (aws-aws-sdk-go-v1.54.10_GH0.tar.gz) = d682bdd896a59a6ad82fceae275a6c20bd1d9b193758dc1db06db97fab956dac
+SIZE (aws-aws-sdk-go-v1.54.10_GH0.tar.gz) = 33088833
+SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
+SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (eiannone-keyboard-6d2a597fd0f1_GH0.tar.gz) = fb97638e3f16a94233a809d50f01e7a20657a44e3cec0e9a00907b0ed909051a
 SIZE (eiannone-keyboard-6d2a597fd0f1_GH0.tar.gz) = 7962
 SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd
@@ -9,10 +13,12 @@ SHA256 (gorilla-websocket-e8629af678b7_GH0.tar.gz) = 5f0b2c4324629f591f6ef1e809e
 SIZE (gorilla-websocket-e8629af678b7_GH0.tar.gz) = 54302
 SHA256 (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 1ccd468fe91f58cd1b144f6317f06b53bf0a5da5e03e6a399a2d03f087db1fe9
 SIZE (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 48265
-SHA256 (stretchr-objx-cbeaeb16a013_GH0.tar.gz) = 17987cf292bf50cf8262fb4904c9a95ad2bbe6238c411b27c98d25c872a69704
-SIZE (stretchr-objx-cbeaeb16a013_GH0.tar.gz) = 23365
-SHA256 (stretchr-testify-6cb3b85ef5a0_GH0.tar.gz) = 3487e33ec43a7fc6f7fb2096b4ed025ba2db6f114c842b1c7471731dc716d4d5
-SIZE (stretchr-testify-6cb3b85ef5a0_GH0.tar.gz) = 81579
+SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
+SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
+SHA256 (stretchr-objx-v0.5.2_GH0.tar.gz) = c21c81a2e619fe8194c9cfafd577a72fe163df5a384d68799fbc54eef4b0e33f
+SIZE (stretchr-objx-v0.5.2_GH0.tar.gz) = 33222
+SHA256 (stretchr-testify-v1.9.0_GH0.tar.gz) = ee651d4d4427d55096007190398102383498e6b5cf97ea9e89ad6e72b4115fbb
+SIZE (stretchr-testify-v1.9.0_GH0.tar.gz) = 108663
 SHA256 (twinj-uuid-70cac2bcd273_GH0.tar.gz) = 7ff209ef2aaf78886bf468919df11e441e125ae9e209808c0e672cbc10247d6f
 SIZE (twinj-uuid-70cac2bcd273_GH0.tar.gz) = 15004
 SHA256 (xtaci-smux-09e2c01560df_GH0.tar.gz) = 40b99ebc5f2d2af9da7efe802422b267ce1162067304eb2f4fdd4247c142a5f4



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