From nobody Thu Apr 06 21:43:59 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Psw4J3R4jz43Ptl; Thu, 6 Apr 2023 21:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Psw4J0shLz468l; Thu, 6 Apr 2023 21:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680817440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VQ5H6ss2a32cY0ObmjtGBpDYI6oLPnPPu4eztg2Ppuw=; b=toknYirIwe0PbjU0bybJJwLknACWj0vU1i7ikV3veEH2Zul7q2Qq4cxJNo1gsTGQLXdyKY 3z5ZMXXeet3jbdqcv40i6EwrD6Vhp/94B+xq6zTk5kTAzD8s8r8tUWE1SDXHn7YWfRO58K pnbCgKA2Y0uC5u10QZWksPb/SdJoWhoUjSoyjfx2Swcj8BJ1QaXLGz4hDmGluGfEC0g8TB lnD8HFSgsz4w8KQQRPkn/H0PYP5QXr6QMl6H8L9BkILaP3UbrGpiUbDIu9GqIElYri22U1 6MgKHJi2V87Rdx6MjpA3Y4FBi0Ocz969ByyiFlMB6WXrM+sqjcGN23JADN27fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680817440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VQ5H6ss2a32cY0ObmjtGBpDYI6oLPnPPu4eztg2Ppuw=; b=W8YdyXT4T8DOD23W6YDosd3ooTBPWI7f3FVPmFawCJ8qNEnvmwUXZPFQAbUc6n9Z9CjWMC JGNbjw6pxZG85nnTpmNVYRp6Gg4ponZVbTP9J1KjsYC/BgDhsrKJsB+gI3LiQvX5yk1Hqp /EHKLLTo15BZ+/lqjjsCUNSvr6YGltJtxNDphNTinXsx/rZPJDe3BHTT7TnKV7rFVPVm/u PRVETLJubhgNSaodF+St4jUpB7x7hyU6Dp2Z208nkSamHHnXi4J40ymE5juYIu/XYidY0f pj4jFHYgvVEZEazY9Px1ddfrU7kZYedH9jUL2u54JBYRibQrAPZrBND+GsOJTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680817440; a=rsa-sha256; cv=none; b=KwV6T9We7VKTm3pu/4ZGHsok7K8Bame4PfYidmcrRjBNW70p22dYSpqDMeSK6qYKJeI8+O mzDXJmPSxMuPvBgeb0ndyL6nQEcnvzGNh2kSWV6DR9MEY+GASdD3AZtQEOejCE5debaKm0 Kflbeic58f1nU6UUUWozA4KH1vFw2ohEw56dLR0s2icBG3CowGrOYbGmmpRQ2K7ucmK/ZA +ymZY1A2DDdxkfSor1y3qGsxwxUvSFUW2Rv2DcRNN4EK2UZqOy95PO+qJyQ42VU9L5g777 PRCH+ZAAthJfG3KT5aw2XVcRsbuRlztlXtfK6njnS1sEMnlwnYRE58iYI+tdjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Psw4H4615zKqM; Thu, 6 Apr 2023 21:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 336Lhxoq070569; Thu, 6 Apr 2023 21:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 336LhxrN070568; Thu, 6 Apr 2023 21:43:59 GMT (envelope-from git) Date: Thu, 6 Apr 2023 21:43:59 GMT Message-Id: <202304062143.336LhxrN070568@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: e5b697968023 - main - sysutils/amazon-ssm-agent: fix build on arm64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5b697968023aa97b952beea579ce58b43a4f6c5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=e5b697968023aa97b952beea579ce58b43a4f6c5 commit e5b697968023aa97b952beea579ce58b43a4f6c5 Author: Robert Clausecker AuthorDate: 2023-04-01 00:07:47 +0000 Commit: Robert Clausecker CommitDate: 2023-04-06 20:33:19 +0000 sysutils/amazon-ssm-agent: fix build on arm64 Bump golang.org/x/sys dependency to a version new enough to support arm64-freebsd. Replace github.com/kr/pty dependency with a new version, which moved to github.com/creack/pty. Approved by: portmgr (build fix blanket) --- sysutils/amazon-ssm-agent/Makefile | 12 +++++++++--- sysutils/amazon-ssm-agent/distinfo | 6 +++++- .../files/patch-agent_session_shell_shell__unix.go | 11 +++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/sysutils/amazon-ssm-agent/Makefile b/sysutils/amazon-ssm-agent/Makefile index dc2c58537624..00af6236e0af 100644 --- a/sysutils/amazon-ssm-agent/Makefile +++ b/sysutils/amazon-ssm-agent/Makefile @@ -1,6 +1,6 @@ PORTNAME= amazon-ssm-agent PORTVERSION= 2.3.1205.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= sysutils MAINTAINER= cperciva@FreeBSD.org @@ -10,8 +10,6 @@ WWW= https://github.com/aws/amazon-ssm-agent LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_aarch64= fails to build: vendor/golang.org/x/sys/unix/cap_freebsd.go:18:23: undefined: CAP_RIGHTS_VERSION_00 - RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= go @@ -19,6 +17,8 @@ USES= go USE_GITHUB= yes GH_ACCOUNT= aws GH_SUBDIR= src/github.com/aws/amazon-ssm-agent +GH_TUPLE= creack:pty:v1.1.18:pty \ + golang:sys:v0.6.0:sys GO_BUILDFLAGS= -ldflags "-s -w" GO_TARGET= ./agent:${PREFIX}/sbin/amazon-ssm-agent \ @@ -37,6 +37,12 @@ PLIST_FILES= etc/amazon/ssm/amazon-ssm-agent.json.template \ USE_RC_SUBR= amazon-ssm-agent +pre-patch: + ${MKDIR} ${WRKSRC}/vendor/src/github.com/creack + ${LN} -s ${WRKSRC_pty} ${WRKSRC}/vendor/src/github.com/creack/pty + ${RM} -r ${WRKSRC}/vendor/src/golang.org/x/sys + ${LN} -s ${WRKSRC_sys} ${WRKSRC}/vendor/src/golang.org/x/sys + post-patch: ${LN} -s ${WRKSRC}/vendor/src/* ${WRKSRC}/vendor/ diff --git a/sysutils/amazon-ssm-agent/distinfo b/sysutils/amazon-ssm-agent/distinfo index 0c818fa6562e..250f703605ed 100644 --- a/sysutils/amazon-ssm-agent/distinfo +++ b/sysutils/amazon-ssm-agent/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1589747277 +TIMESTAMP = 1680307376 SHA256 (aws-amazon-ssm-agent-2.3.1205.0_GH0.tar.gz) = 3a2424c6cd669486581ccf09cd57cbaecd69ef5731a62a50a826eb4b9515face SIZE (aws-amazon-ssm-agent-2.3.1205.0_GH0.tar.gz) = 22202960 +SHA256 (creack-pty-v1.1.18_GH0.tar.gz) = 7a1d6775e3f99b98e5d87303e9aeacfd73d810abffc17e42a561d0650adc980e +SIZE (creack-pty-v1.1.18_GH0.tar.gz) = 10668 +SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/sysutils/amazon-ssm-agent/files/patch-agent_session_shell_shell__unix.go b/sysutils/amazon-ssm-agent/files/patch-agent_session_shell_shell__unix.go new file mode 100644 index 000000000000..7ef13858cc9f --- /dev/null +++ b/sysutils/amazon-ssm-agent/files/patch-agent_session_shell_shell__unix.go @@ -0,0 +1,11 @@ +--- agent/session/shell/shell_unix.go.orig 2023-04-01 00:01:35 UTC ++++ agent/session/shell/shell_unix.go +@@ -34,7 +34,7 @@ import ( + "github.com/aws/amazon-ssm-agent/agent/log" + mgsContracts "github.com/aws/amazon-ssm-agent/agent/session/contracts" + "github.com/aws/amazon-ssm-agent/agent/session/utility" +- "github.com/kr/pty" ++ "github.com/creack/pty" + ) + + var ptyFile *os.File