From nobody Sun May 28 17:04:38 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 4QTlPz0BRTz4Xd9M; Sun, 28 May 2023 17:04:39 +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 4QTlPy6dHLz3QxY; Sun, 28 May 2023 17:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685293478; 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=IeQQukzD+evmHwLPZp99hXyhpvIMMe178TqYhd9656c=; b=xjvae4xW213L5k/jVdbT57rcq0uI8adrL46LpEMutoPqNYyP2FLiw/cpSyr6o0wPJS/Jal vbduOr+GwIqwHpAvxxlcsPUX+OoijarczdMX8qoeoguGdtQWN/O882ZbZ9K/3pqSbL0p87 K+PbyAFm4NLpt7uerEmdo7lqOeni8Vv9i/w6ZuQB0WLqem4EP2QCHPIduk7PmQIRcNdSoV EksyQBrH+fYZldmtGDHAHXMCU45mSma0NpYPKh6wTXGcDCsggLT4DrvNZuxqcUUUe3PsMH Cbxv/YGwGwvLSKzTJ9FATR29GoMQgxZnCVEe3Vm07BzF6SMGU9nT7ycT3JCGGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685293478; 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=IeQQukzD+evmHwLPZp99hXyhpvIMMe178TqYhd9656c=; b=hgAhGbK/jxKkAJ45YChTETvRtT+bifZcj0t8tGSN3ubH2z1xqLTXaIU3JLbjq332+iOypZ 4dUfL00dQjnPuOMOJ49yonjANP1VMI0etM5OlMom65v/402Qe1WuVUvPt/LtgQRoERs+3r 8pwHwzjmlMMyksPL+r9tL+FUsU7D4NcreoKcRM0II3ij7D9r5QDICb4w6BDuHPg9Vn6Mlf /bX2UMfRnC978q46KvmXja+lSv1skgim1Wlq6CP1/JDjk68f1tSwh46d3HlysH4BJvAfXv p19uhL7mWe7vXLHoy+vJuhNphB0lC/RV04zdNjA1YB6ZhVRRuTomG9rEZp79Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685293478; a=rsa-sha256; cv=none; b=ltGvV9m9Izakxc/44rUhqeTooqroBHBqJNr4FwK8Upf6tIn0VxgNUuyWyx5qoo/2ZsqZh/ ZkMgdKQxP+ICImz14nbzLtBWGB7O2ZdSBh9Os1mVLcbQ5duwOlFvkN8J2EqzLVbWIEnosY wl8jdGj4LeiJ+LZc5x2bCNF49YRSL6bQCFz56ZACepc2PhyzvLQrB7GY73x++xJrFA61IS nfT3SKGAhheCWRMMlYz0pF7y10MAi//Ssb9rfgT/n5aMsGFGRWvFzaHWOyxIqo1R2OQa2b 8dZafWatNeKDuA3dlgdIh6OqEW/tqxHD4FKLbrOpGtWbmLbPfOPSPq4++b5lFg== 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 4QTlPy5kVfzdpg; Sun, 28 May 2023 17:04:38 +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 34SH4cXp064207; Sun, 28 May 2023 17:04:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34SH4cv7064206; Sun, 28 May 2023 17:04:38 GMT (envelope-from git) Date: Sun, 28 May 2023 17:04:38 GMT Message-Id: <202305281704.34SH4cv7064206@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: e51591ee47bb - main - net/gitlab-agent: update to 16.0.1 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e51591ee47bb609ff7ce4b7248ca61f662c2a570 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e51591ee47bb609ff7ce4b7248ca61f662c2a570 commit e51591ee47bb609ff7ce4b7248ca61f662c2a570 Author: Matthias Fechner AuthorDate: 2023-05-21 08:53:17 +0000 Commit: Matthias Fechner CommitDate: 2023-05-28 17:03:48 +0000 net/gitlab-agent: update to 16.0.1 Required for gitlab-ce 16.0.0 Changelog: https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/commits/master This release also includes patches to fix the issue: https://github.com/open-telemetry/opentelemetry-go/issues/4076 https://github.com/open-telemetry/opentelemetry-go/pull/4077 Reported upstream here: https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/issues/410 --- net/gitlab-agent/Makefile | 10 +++++----- net/gitlab-agent/distinfo | 10 +++++----- ...or_go.opentelemetry.io_otel_sdk_resource_host__id__exec.go | 11 +++++++++++ ...o.opentelemetry.io_otel_sdk_resource_host__id__readfile.go | 11 +++++++++++ 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile index 4e8e2a9ab18e..089c8207b1d0 100644 --- a/net/gitlab-agent/Makefile +++ b/net/gitlab-agent/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-agent -PORTVERSION= 15.11.0 +PORTVERSION= 16.0.1 DISTVERSIONPREFIX= v CATEGORIES= net @@ -14,14 +14,14 @@ BUILD_DEPENDS= git>=0:devel/git \ golangci-lint>=0:devel/golangci-lint USES= go:modules -GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v15 +GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16 _BUILD_DATE= $$(date -u "+%Y-%m-%d-%H%M UTC") GO_BUILDFLAGS= -tags="tracer_static,tracer_static_jaeger" \ -ldflags=" \ - -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v15/cmd.Version=v${PORTVERSION}' \ - -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v15/cmd.Commit=${GL_COMMIT:C/^(........).*/\1/}' \ - -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v15/cmd.BuildTime=${_BUILD_DATE}'" + -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/cmd.Version=v${PORTVERSION}' \ + -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/cmd.Commit=${GL_COMMIT:C/^(........).*/\1/}' \ + -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/cmd.BuildTime=${_BUILD_DATE}'" GO_TARGET= ./cmd/kas PLIST_FILES= bin/kas diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 36e720bf2ac7..190ed556e698 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1682145775 -SHA256 (go/net_gitlab-agent/gitlab-agent-v15.11.0/v15.11.0.mod) = 6aaae783c3e97fcd41a5a05ff0d20e05867d7bbb77ce13ba8d2fda6e0c907d58 -SIZE (go/net_gitlab-agent/gitlab-agent-v15.11.0/v15.11.0.mod) = 10767 -SHA256 (go/net_gitlab-agent/gitlab-agent-v15.11.0/v15.11.0.zip) = 5b0db2a41e117b4b6c028fcd5dc16d4a5160b000afd29443163872474e04cbb2 -SIZE (go/net_gitlab-agent/gitlab-agent-v15.11.0/v15.11.0.zip) = 984432 +TIMESTAMP = 1684559854 +SHA256 (go/net_gitlab-agent/gitlab-agent-v16.0.1/v16.0.1.mod) = ff021521aceabf93ee5e78d92c4e58a75fa6b1c9ed683bf0c52ae5953841e5da +SIZE (go/net_gitlab-agent/gitlab-agent-v16.0.1/v16.0.1.mod) = 11681 +SHA256 (go/net_gitlab-agent/gitlab-agent-v16.0.1/v16.0.1.zip) = ad0c2a99e4f10c564f289f09f8ea54ee6aa3edc58162ea992b575898d037c609 +SIZE (go/net_gitlab-agent/gitlab-agent-v16.0.1/v16.0.1.zip) = 1015772 diff --git a/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__exec.go b/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__exec.go new file mode 100644 index 000000000000..1110b8c3e8b7 --- /dev/null +++ b/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__exec.go @@ -0,0 +1,11 @@ +--- vendor/go.opentelemetry.io/otel/sdk/resource/host_id_exec.go.orig 2023-05-20 05:42:01 UTC ++++ vendor/go.opentelemetry.io/otel/sdk/resource/host_id_exec.go +@@ -12,7 +12,7 @@ + // See the License for the specific language governing permissions and + // limitations under the License. + +-//go:build bsd || darwin ++//go:build darwin || dragonfly || freebsd || netbsd || openbsd || solaris + + package resource // import "go.opentelemetry.io/otel/sdk/resource" + diff --git a/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__readfile.go b/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__readfile.go new file mode 100644 index 000000000000..dc2d2b4ab376 --- /dev/null +++ b/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__readfile.go @@ -0,0 +1,11 @@ +--- vendor/go.opentelemetry.io/otel/sdk/resource/host_id_readfile.go.orig 2023-05-20 05:42:17 UTC ++++ vendor/go.opentelemetry.io/otel/sdk/resource/host_id_readfile.go +@@ -12,7 +12,7 @@ + // See the License for the specific language governing permissions and + // limitations under the License. + +-//go:build bsd || linux ++//go:build darwin || dragonfly || freebsd || netbsd || openbsd || solaris + + package resource // import "go.opentelemetry.io/otel/sdk/resource" +