From nobody Sat Jul 08 10:58:26 2023 X-Original-To: dev-commits-ports-branches@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 4QynLf1zbzz4ly0g; Sat, 8 Jul 2023 10:58:34 +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 4QynLW0CQJz4T5d; Sat, 8 Jul 2023 10:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688813907; 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=bbcPOXrkUR6eidz1ea1+mOVhRN/H0J9S+xSmT2bsAII=; b=JZ310UzdtWN00KIxt0jF2poq/F3CtCL1qVAgrO3LmmiHV1Mf73AMoe1f3Aq/icKVxe2E9K MmS34WmGdpCKyGraE5S3R70DwFrL+PnGh0ZQ0Ua9feRDSJ2sZauJGgN5DBSbtf7tVwXSeW v8TaG6uk6VePRV+n7ij5Tf33TChe4saa+41qgDuATqQ+50PSdL05frREnj8ND8MH2aBPuR dnshVNXtchuhMOMMrBGwIVefV8u8PNgJglgjOyKNw05vWxIrumnd3sFkAk+8yJDu4UN6T6 Ow2/7b0L44iLF9BFUDXqwCTWX2I3+/0b4+8bGoSyGp7w3P5GP/Q9NeEnVFzCRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688813907; 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=bbcPOXrkUR6eidz1ea1+mOVhRN/H0J9S+xSmT2bsAII=; b=ACGX930owlcOv0z2hQUGhv6HK3qIjed1Wq7tbZc+IfstX7ACKo9QiAOUIUD2sly57jIWBW 6ylDrn8gTAtfTQoXh8nL7ZFHup6wSeyz+g4pNYpQyV/ki4V+HkLDQ/TLqVYxm6QFEEgKe4 Tz/+7XOe4Eiqp7xQK22OpWCYFh4mJZFsY/Ukrq5RMTDXtcVEEHiblZ0aaTJLgSfqM4AmDK E79bVOuiWfKa1Y23DvU1uYYatiEojsWmNS0X/IJZcf1xyovru8mHAYpVkgViQOJgwXMeqF gUVCrrC93T3OcLq11Ng8RPFXYm/BJjfrDAwRWhGa7yImNQw4ifmVmW2S4t+F5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688813907; a=rsa-sha256; cv=none; b=V6FifoLcAH0jeHMBdW3SOpDHY0CpSB+vZI0xXhvbaQa2xa+RmeXVEPbEvV/7L5S6Wj5r8E nulEh7uG4o3SM0pNKgF/cayPTXL9Eaqroob5/pQiyzjfl7WzI4FtwcuaB8KwuclkxzigG/ q568x9+5pwV56HscABixzmE1gDku6UJMUQCO7sCSnvj0LU17qf6bulJdmzLey4VM6PEw/k E1ovhf3Q6tocqVYAvFvc13JU3lUouaE6eWQFMav3wCawAY5byC74YJocIzabHVVZqlfTr9 SVwuj/2z6ZeGum2bef9I3hCqFtoqLjR8dc2g6Tkx2JbnWy5UTxho29E5KNigyQ== 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 4QynLV64FnzHvS; Sat, 8 Jul 2023 10:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 368AwQjK002426; Sat, 8 Jul 2023 10:58:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 368AwQKj002425; Sat, 8 Jul 2023 10:58:26 GMT (envelope-from git) Date: Sat, 8 Jul 2023 10:58:26 GMT Message-Id: <202307081058.368AwQKj002425@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 35143b28fa81 - 2023Q3 - net/gitlab-agent: update to 16.1.3 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q3 X-Git-Reftype: branch X-Git-Commit: 35143b28fa810a8e05a71fbea71cffc4eac48025 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=35143b28fa810a8e05a71fbea71cffc4eac48025 commit 35143b28fa810a8e05a71fbea71cffc4eac48025 Author: Matthias Fechner AuthorDate: 2023-06-24 05:16:55 +0000 Commit: Matthias Fechner CommitDate: 2023-07-08 09:07:19 +0000 net/gitlab-agent: update to 16.1.3 Required for gitlab-ce 16.1 (cherry picked from commit bdcb50cd6f523baa09ea1e81ec9418ec1d9f2f87) --- net/gitlab-agent/Makefile | 2 +- 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, 6 insertions(+), 28 deletions(-) diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile index 089c8207b1d0..38ddeb8764c6 100644 --- a/net/gitlab-agent/Makefile +++ b/net/gitlab-agent/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-agent -PORTVERSION= 16.0.1 +PORTVERSION= 16.1.3 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 190ed556e698..1641286b6566 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1687449676 +SHA256 (go/net_gitlab-agent/gitlab-agent-v16.1.3/v16.1.3.mod) = 8c8898b55a85bc407ea6a6d42b6e5f6744bcf8cd16a9c2748d4ba01ab011e9be +SIZE (go/net_gitlab-agent/gitlab-agent-v16.1.3/v16.1.3.mod) = 9741 +SHA256 (go/net_gitlab-agent/gitlab-agent-v16.1.3/v16.1.3.zip) = 206a5a0600b65c853cc628b5c41e5130d483ff2186f5c9b3285c5e00e0b82d4a +SIZE (go/net_gitlab-agent/gitlab-agent-v16.1.3/v16.1.3.zip) = 1159758 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 deleted file mode 100644 index 1110b8c3e8b7..000000000000 --- a/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__exec.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index dc2d2b4ab376..000000000000 --- a/net/gitlab-agent/files/patch-vendor_go.opentelemetry.io_otel_sdk_resource_host__id__readfile.go +++ /dev/null @@ -1,11 +0,0 @@ ---- 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" -