From nobody Mon Apr 29 04:54:00 2024 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 4VSWFP0M0Qz5JFMb; Mon, 29 Apr 2024 04:54:01 +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 4VSWFN5LMHz4CfY; Mon, 29 Apr 2024 04:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714366440; 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=nOw2TUpoVJgdawi5Eo8N6LDwsyrRySNiZDE7LkB9Qi0=; b=WBaRFls0SkhESdQ34KMxmqwmR+XjS+gQKdYfBeNvIBTMMYscUd/5ZPUkKwM98R+4K6gLoq /cfdK/Z34bGYP9IoLdnTngJJmahm1SA2kFTna5XP74UxnK0aG87Ldj0jSCXgVjT2NjsDkn AaPJqJzjdO56RLUPAmKth18edTHGBjGRtZfqdJgZICzuYolONoAUIbpj25eQmZrxYzWm+W +/avxayXg5y6qH++tAflEHGowZjQ2+R8Rg6kEQFK+uGkIvsSzcDeme+pzdpsUQX/f8uCWV knlf4BO56CmSsWAqMqMqlLhnoXuS4SAdJSWzVucGSrIuJyol3UvbHmWFCPrixQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714366440; a=rsa-sha256; cv=none; b=tFC2ZOKXd812irm/mfUE+S7AiKnw3+WSELYwIUS6ClAYAIm0cDbz/ocotwROiZZ9ok7vrS 5osw5IWwdySnoV0pNQiXLdgJF/zQpJPY08MpPIaQZcGicbjeA0GC9rgN3GmmEKy2/ULbeV d2nitXBQ3h8h1A2WrqR0TmYz0VeSHgITTBrwQ+wPptwOHF1PPdpkC35MHLNWowm3eVY+Dk hUzUN+Q0bnHIRmlS8/IrHE/wojTPErMRL90+k5aRUZiOhptqL2aWxhwsgVdmbX43PZEtam /KTrZ8KbpyKq8W4VgNi7NSB/EanQ2PgWwXn4BIsU6wiK36GTC37OVf+CiZB3XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714366440; 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=nOw2TUpoVJgdawi5Eo8N6LDwsyrRySNiZDE7LkB9Qi0=; b=ZIh6a6MPUCWJc5pkD3dca1gJWM5ylNFCDj6aLhKPfinZK3ZExsrXo49OGu+xVnPJnprDeU H2bW+xpXuCJsnEHEk0ctFlR2NXZaMEqg/3VtcpKS5xOca47ZBeoWOlpeUrOTyWJKORnpev jRb5DiyMXZqeQK4N22M92hE807WlDu2a3HeqNQrT35x7x3gI7ehBJIoE1tTc96/0ovYDgF HceOsBUu239GlJyuBARBIx5wvZ08y+GZ5LPl2q4Z7sUXdPewln6GiwPUWp6sXxamKQy7eR rK8W4iH+E3Umx57QYO114BakQpcnHpSlO0Am7S1PAv9qWifi6N5eN7Pd21l5sg== 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 4VSWFN49vhzvsk; Mon, 29 Apr 2024 04:54:00 +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 43T4s0hw095220; Mon, 29 Apr 2024 04:54:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43T4s0Lr095217; Mon, 29 Apr 2024 04:54:00 GMT (envelope-from git) Date: Mon, 29 Apr 2024 04:54:00 GMT Message-Id: <202404290454.43T4s0Lr095217@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: 02afd2d3a6c1 - 2024Q2 - www/gitlab: security and patch update to 16.11.1 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: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-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/2024Q2 X-Git-Reftype: branch X-Git-Commit: 02afd2d3a6c1cee7affc3beac0f85cec93df79a6 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=02afd2d3a6c1cee7affc3beac0f85cec93df79a6 commit 02afd2d3a6c1cee7affc3beac0f85cec93df79a6 Author: Matthias Fechner AuthorDate: 2024-04-26 04:14:12 +0000 Commit: Matthias Fechner CommitDate: 2024-04-29 04:23:53 +0000 www/gitlab: security and patch update to 16.11.1 Changes: https://about.gitlab.com/releases/2024/04/24/patch-release-gitlab-16-11-1-released/ MFH: 2024Q2 Security: b857606c-0266-11ef-8681-001b217b3468 (cherry picked from commit d20d02e6292b31b32b71fca0406b108a217d208e) --- devel/gitaly/Makefile | 2 +- devel/gitaly/distinfo | 10 +++++----- devel/gitlab-runner/Makefile | 3 ++- net/gitlab-agent/Makefile | 4 ++-- net/gitlab-agent/distinfo | 10 +++++----- www/gitlab-pages/Makefile | 3 +-- www/gitlab-pages/distinfo | 10 +++++----- www/gitlab-workhorse/Makefile | 2 +- www/gitlab-workhorse/distinfo | 10 +++++----- www/gitlab/Makefile | 4 ++-- www/gitlab/distinfo | 12 ++++++------ 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 811ebb8e1276..07d2f5bf3604 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitaly DISTVERSIONPREFIX= v -DISTVERSION= 16.11.0 +DISTVERSION= 16.11.1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index d66dd8ad0e63..cb4288f115aa 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1713634052 -SHA256 (go/devel_gitaly/gitaly-v16.11.0/go.mod) = 701cdacc7cfef68f40611c56a42b322cd4ddce5d2ad0508d51e43013adca7388 -SIZE (go/devel_gitaly/gitaly-v16.11.0/go.mod) = 11024 -SHA256 (go/devel_gitaly/gitaly-v16.11.0/gitaly-v16.11.0.tar.bz2) = 7e0eb6de98e855db4e455a5b6493f6bf26c475f740aa615ef79686a6d786cb57 -SIZE (go/devel_gitaly/gitaly-v16.11.0/gitaly-v16.11.0.tar.bz2) = 2607295 +TIMESTAMP = 1713982836 +SHA256 (go/devel_gitaly/gitaly-v16.11.1/go.mod) = 701cdacc7cfef68f40611c56a42b322cd4ddce5d2ad0508d51e43013adca7388 +SIZE (go/devel_gitaly/gitaly-v16.11.1/go.mod) = 11024 +SHA256 (go/devel_gitaly/gitaly-v16.11.1/gitaly-v16.11.1.tar.bz2) = 99d565a0ba2d819ec1e3a92ccff6b559fc15b1f58513cd0f3f49ffbb01d99ed4 +SIZE (go/devel_gitaly/gitaly-v16.11.1/gitaly-v16.11.1.tar.bz2) = 2607377 diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile index cd6880a74671..a2e203ea126f 100644 --- a/devel/gitlab-runner/Makefile +++ b/devel/gitlab-runner/Makefile @@ -1,6 +1,7 @@ PORTNAME= gitlab-runner DISTVERSIONPREFIX= v DISTVERSION= 16.11.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \ https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerarm @@ -27,7 +28,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org USE_RC_SUBR= gitlab_runner -GITBRANCH= 16-10-stable +GITBRANCH= 16-11-stable GO_MODULE= gitlab.com/gitlab-org/gitlab-runner _BUILD_DATE= $$(date -u +%Y-%m-%dT%H:%M:%S%z) diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile index c4d12085576c..3481732b981c 100644 --- a/net/gitlab-agent/Makefile +++ b/net/gitlab-agent/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-agent -PORTVERSION= 16.11.0 +PORTVERSION= 16.11.1 DISTVERSIONPREFIX= v CATEGORIES= net @@ -17,12 +17,12 @@ USES= go:modules,1.22 GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16 _BUILD_DATE= $$(date -u "+%Y-%m-%d-%H%M UTC") +GO_TARGET= ./cmd/kas GO_BUILDFLAGS= -tags="tracer_static,tracer_static_jaeger" \ -ldflags=" \ -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_TAGNAME: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 88101dd43872..671fc986fe47 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1713414289 -SHA256 (go/net_gitlab-agent/gitlab-agent-v16.11.0/v16.11.0.mod) = 73740cc2454413865622b26264c35ee5cdd7dd701e66e9e9642dc7d30e690b56 -SIZE (go/net_gitlab-agent/gitlab-agent-v16.11.0/v16.11.0.mod) = 7055 -SHA256 (go/net_gitlab-agent/gitlab-agent-v16.11.0/v16.11.0.zip) = 37058485885f144c1e7eaf16bcfec7304ee7fda56630db89ea73a2093e26e41a -SIZE (go/net_gitlab-agent/gitlab-agent-v16.11.0/v16.11.0.zip) = 1255441 +TIMESTAMP = 1714054581 +SHA256 (go/net_gitlab-agent/gitlab-agent-v16.11.1/v16.11.1.mod) = 73740cc2454413865622b26264c35ee5cdd7dd701e66e9e9642dc7d30e690b56 +SIZE (go/net_gitlab-agent/gitlab-agent-v16.11.1/v16.11.1.mod) = 7055 +SHA256 (go/net_gitlab-agent/gitlab-agent-v16.11.1/v16.11.1.zip) = 83d04e4de5edec836135e138cf948c2d06e9c2447626f5f2986ea0f5b6d2ce13 +SIZE (go/net_gitlab-agent/gitlab-agent-v16.11.1/v16.11.1.zip) = 1255441 diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile index 3e2e381a9b8e..d4b91db168ea 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -1,7 +1,6 @@ PORTNAME= gitlab-pages -PORTVERSION= 16.11.0 +PORTVERSION= 16.11.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= www MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/ DISTFILES+= go.mod diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index 1acd35b85cba..88dda09b0e8c 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1713633989 -SHA256 (go/www_gitlab-pages/gitlab-pages-v16.11.0/go.mod) = de0926d06d56e5cdb84c2c4fd4bc05bb9c8c3724a8e1cf8c0f775856958540ba -SIZE (go/www_gitlab-pages/gitlab-pages-v16.11.0/go.mod) = 3328 -SHA256 (go/www_gitlab-pages/gitlab-pages-v16.11.0/gitlab-pages-v16.11.0.tar.bz2) = d9180a31353be2e9c41d22e2a9d91cad62cc4ef00ef7ae202170fde0aea2c9fc -SIZE (go/www_gitlab-pages/gitlab-pages-v16.11.0/gitlab-pages-v16.11.0.tar.bz2) = 212557 +TIMESTAMP = 1713982677 +SHA256 (go/www_gitlab-pages/gitlab-pages-v16.11.1/go.mod) = de0926d06d56e5cdb84c2c4fd4bc05bb9c8c3724a8e1cf8c0f775856958540ba +SIZE (go/www_gitlab-pages/gitlab-pages-v16.11.1/go.mod) = 3328 +SHA256 (go/www_gitlab-pages/gitlab-pages-v16.11.1/gitlab-pages-v16.11.1.tar.bz2) = 65597af30b8178b0769934e78f4fa6caccb64eaedae7324133acf8161bdbfc04 +SIZE (go/www_gitlab-pages/gitlab-pages-v16.11.1/gitlab-pages-v16.11.1.tar.bz2) = 212534 diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index edd5eea933ed..113f1dab6900 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-workhorse -PORTVERSION= 16.11.0 +PORTVERSION= 16.11.1 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 9012462a1600..c5664eafd7e9 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1713633714 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.11.0/go.mod) = 2c1ff4ba288aa4bf72cc93438b6dda7660257f50eeb7823f9acc0dde5412c499 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.11.0/go.mod) = 7010 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.11.0/gitlab-foss-v16.11.0.tar.bz2) = f37af6af67c0d281000098519dec8b62acd678c633c121cf6135d4874f6319c8 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.11.0/gitlab-foss-v16.11.0.tar.bz2) = 102630775 +TIMESTAMP = 1713982846 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.11.1/go.mod) = 2c1ff4ba288aa4bf72cc93438b6dda7660257f50eeb7823f9acc0dde5412c499 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.11.1/go.mod) = 7010 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.11.1/gitlab-foss-v16.11.1.tar.bz2) = 2488091d06c2f4a2643f7d72449c77bc35d7a1c607123ec1fddb467884ed867c +SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.11.1/gitlab-foss-v16.11.1.tar.bz2) = 102638191 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 4cec0e0ca20d..a2297321bcb7 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-${FLAVOR:Uce} -PORTVERSION= 16.11.0 +PORTVERSION= 16.11.1 DISTVERSIONPREFIX= v .if ${FLAVOR:U} == ee DISTVERSIONSUFFIX= -ee @@ -29,7 +29,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE MY_DEPENDS= git>=2.41.0:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ gitlab-elasticsearch-indexer>=4.8.0:textproc/gitlab-elasticsearch-indexer \ - gitlab-agent>=16.10.1:net/gitlab-agent \ + gitlab-agent>=${PORTVERSION}:net/gitlab-agent \ gitlab-pages>=${PORTVERSION}:www/gitlab-pages \ gitlab-shell>=14.35.0:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index 88ec868535d7..b66e7e93f631 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1713633902 -SHA256 (gitlab-foss-v16.11.0.tar.bz2) = f37af6af67c0d281000098519dec8b62acd678c633c121cf6135d4874f6319c8 -SIZE (gitlab-foss-v16.11.0.tar.bz2) = 102630775 -TIMESTAMP = 1713633967 -SHA256 (gitlab-v16.11.0-ee.tar.bz2) = 93d25af24702d173e52eee9ef2437c0b5faf688b675d9e8358d0f496e7fb960f -SIZE (gitlab-v16.11.0-ee.tar.bz2) = 110296983 +TIMESTAMP = 1713983499 +SHA256 (gitlab-foss-v16.11.1.tar.bz2) = 2488091d06c2f4a2643f7d72449c77bc35d7a1c607123ec1fddb467884ed867c +SIZE (gitlab-foss-v16.11.1.tar.bz2) = 102638191 +TIMESTAMP = 1713983576 +SHA256 (gitlab-v16.11.1-ee.tar.bz2) = 12b67b117cb5c7b189fc3ead7dcfa01fc67f7a94ed0b4b0abe40b1140fb4a72c +SIZE (gitlab-v16.11.1-ee.tar.bz2) = 110307818