From nobody Thu Aug 25 13:21:16 2022 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 4MD3Wd0nzqz4ZXwZ; Thu, 25 Aug 2022 13:21:17 +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 4MD3Wc6ryHz491L; Thu, 25 Aug 2022 13:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661433677; 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=HwyUPFW4S/DXbKXEZNfVfA4AFaIq+uN62psDca4hWGM=; b=IGem7BYcEuqPYvwipd1/KbHn3TZbVdL+4/aT5BCu5Qxu25dDm4GOi3wiR4V3h87sTV8sqh /QuynpwQyjB84SjhWj7G7nyYtZNRT0FDCff+1/6PC186RlGUNIG3f02+4UtZkWboVP95ff mNzxpf1CuFkzn5JGIB4B0ksUicqVhNa1G9B9oxL7fHGLVtD9TP4nttCdBqEKHm8FNX9R2q hGoUjzzLOZM7eTsQLX6YC+Lv9+A+o+2SwnehY3s1DdnGpvtVQ6uSKrFsj5u1N597nedvfW e0+oIB6ZIwCGq21vyBejA7Ix6FTXBURGmh+LgdZ1YTlKig7b6xjZ0UiSPc47uA== 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 4MD3Wc5yLWzpqP; Thu, 25 Aug 2022 13:21:16 +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 27PDLGZ4089572; Thu, 25 Aug 2022 13:21:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PDLG2W089571; Thu, 25 Aug 2022 13:21:16 GMT (envelope-from git) Date: Thu, 25 Aug 2022 13:21:16 GMT Message-Id: <202208251321.27PDLG2W089571@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: 1c2885ba2525 - 2022Q3 - www/gitlab-ce: security update to 15.2.2 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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 1c2885ba252564c197c80052bba44890efea57c2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661433677; 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=HwyUPFW4S/DXbKXEZNfVfA4AFaIq+uN62psDca4hWGM=; b=k3wasLxbJ4+5b3AI6gb2dNM3NURm4yeTGMohBskkkHm+Hb5P8YWhoGeeMIV1e12mlVO/Ql vv3vroHlk4m61ll9g1lTMtC/6SC5NuvlCDJK0sYwpEHGbw3FcYhjk/kc+c6/jcM3Xo8Vkm 8L+9zafHVLBRxad60um3yuw0dPwTVX8tBQmE66KMjPN753he+34hkoStFfCuqAU98rjj16 ANGxZ7vEgV09asYNx2TuMXg0pM+PYhs3rCjpsU2AT3Qk3coRo34boXPKbGn9pPbcVTMqVM 0AW+IO9Lewbo/yohxAt1qKbROFfExbmba76fvyZwEhdMaX51zS6OnSs42W+7vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661433677; a=rsa-sha256; cv=none; b=B/yIaCmK2287JQ5ZE4jlCKM5aDfhy5b/sfcl8+c/T09YLtYWaoQH/XGSqlQOzAGTwU6iun QhmE2wUqDxk5NwlxEQojaqtcNX3WyaLyNuTZoh/HdLOWGJRm+6KElTTs2uLcDdXXnnQhsL fm8JmLlmyGop7DNH5PsXVxqhLiZyySA1NR5RVxtqoq1C5jzPK6ZXX1EyW0Z57790fiRIUL Kgkp/ksCTspL+vZ2kYUN3mhNXn4nbScWHbn1TMfL9d5EcWmisrkKoJxx/vccP2bDFwQU8F MFBB7jzKh8mCO6OJkhrDCayod9Y3nxZR/CPocs/J9z8V4GynYmuFQnmSSVZ4Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c2885ba252564c197c80052bba44890efea57c2 commit 1c2885ba252564c197c80052bba44890efea57c2 Author: Matthias Fechner AuthorDate: 2022-08-16 14:18:01 +0000 Commit: Matthias Fechner CommitDate: 2022-08-25 13:20:21 +0000 www/gitlab-ce: security update to 15.2.2 Changelog: https://about.gitlab.com/releases/2022/07/28/security-release-gitlab-15-2-1-released/ https://about.gitlab.com/releases/2022/08/01/gitlab-15-2-2-released/ (cherry picked from commit 68cf6a1c0f8979bccf94f6cc56183f2b30855c4c) --- devel/gitaly/Makefile | 4 ++-- devel/gitaly/distinfo | 10 +++++----- www/gitlab-ce/Makefile | 6 +++--- www/gitlab-ce/distinfo | 6 +++--- www/gitlab-workhorse/Makefile | 4 ++-- www/gitlab-workhorse/distinfo | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index d45e5514ddc6..8b0a15662c04 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 15.2.0 +DISTVERSION= 15.2.2 DISTVERSIONPREFIX= v PORTREVISION= 0 CATEGORIES= devel @@ -51,7 +51,7 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 91f52100ffca75bb08e295d34da3a02a46c5df78 +GL_COMMIT= 94d5f4f16427baeee577f2d6162c44c1d54a1edd # for go dependencies # Gitlab hosts there dependencies on their own platform and not on go-proxy diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index bfbc5da7f6b0..62835e82781c 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1658817992 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0/go.mod) = dc003dfe788c03dfd145369d4d81321f1306df51dac7289a6491dc84e25b2bbc -SIZE (go/devel_gitaly/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0/go.mod) = 9144 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0.tar.gz) = f3be6247359252ccad7dbb67c18819213310488842c7370d84766d8e2e40783a -SIZE (go/devel_gitaly/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0.tar.gz) = 4001229 +TIMESTAMP = 1660635237 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-94d5f4f16427baeee577f2d6162c44c1d54a1edd_GL0/go.mod) = dc003dfe788c03dfd145369d4d81321f1306df51dac7289a6491dc84e25b2bbc +SIZE (go/devel_gitaly/gitlab-org-gitaly-94d5f4f16427baeee577f2d6162c44c1d54a1edd_GL0/go.mod) = 9144 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-94d5f4f16427baeee577f2d6162c44c1d54a1edd_GL0/gitlab-org-gitaly-94d5f4f16427baeee577f2d6162c44c1d54a1edd_GL0.tar.gz) = bf31c72906d0770da32cf3a4db9ddd7affd869a44991a7d4c4b1659d5729eecf +SIZE (go/devel_gitaly/gitlab-org-gitaly-94d5f4f16427baeee577f2d6162c44c1d54a1edd_GL0/gitlab-org-gitaly-94d5f4f16427baeee577f2d6162c44c1d54a1edd_GL0.tar.gz) = 4002561 diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 3603e07033ad..7da2e417f20c 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-ce -PORTVERSION= 15.2.0 +PORTVERSION= 15.2.2 PORTREVISION= 0 CATEGORIES= www devel @@ -249,7 +249,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \ rubygem-json>=2.5.1<3:devel/rubygem-json \ rubygem-json_schemer>=0.2.18<0.3:devel/rubygem-json_schemer \ - rubygem-oj>=3.13.16<3.14:devel/rubygem-oj \ + rubygem-oj>=3.13.19<3.14:devel/rubygem-oj \ rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \ rubygem-yajl-ruby>=1.4.1<1.5:devel/rubygem-yajl-ruby \ rubygem-webauthn>=2.3<3:security/rubygem-webauthn \ @@ -277,7 +277,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= a876afc5fd85a4ccae6947941884f3913f472ab0 +GL_COMMIT= 4ecb014a9353d25d25249cceb268ee34eab0c96b USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index d7b678883391..c7c8d52877c1 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658815292 -SHA256 (gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0.tar.gz) = 281c61ce7279e5d8bd9afd2e28e1cdab944b7e2d3383b545e03b8480f9bdaf07 -SIZE (gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0.tar.gz) = 101269547 +TIMESTAMP = 1660638267 +SHA256 (gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0.tar.gz) = 2f1579ad2a5f7204fc20e086ca597bdf6278de80ea4fe134d011b594883c6cfc +SIZE (gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0.tar.gz) = 101281744 diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index e025d82f80c6..9bf7cc7bbb87 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Zuehlsdorff PORTNAME= gitlab-workhorse -PORTVERSION= 15.2.0 +PORTVERSION= 15.2.2 DISTVERSIONPREFIX= v PORTREVISION= 0 CATEGORIES= www @@ -26,7 +26,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= a876afc5fd85a4ccae6947941884f3913f472ab0 +GL_COMMIT= 4ecb014a9353d25d25249cceb268ee34eab0c96b # for go dependencies # Gitlab hosts there dependencies on their own platform and not on go-proxy diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index fc9b2a709bd8..79143aea7dea 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1658821522 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0/go.mod) = 3aad71b404db096347d2dc6f7a2d98a031d66ac70ed6626546f49bac91ddf380 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0/go.mod) = 5778 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0/gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0.tar.gz) = 281c61ce7279e5d8bd9afd2e28e1cdab944b7e2d3383b545e03b8480f9bdaf07 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0/gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0.tar.gz) = 101269547 +TIMESTAMP = 1660638161 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0/go.mod) = 3aad71b404db096347d2dc6f7a2d98a031d66ac70ed6626546f49bac91ddf380 +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0/go.mod) = 5778 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0/gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0.tar.gz) = 2f1579ad2a5f7204fc20e086ca597bdf6278de80ea4fe134d011b594883c6cfc +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0/gitlab-org-gitlab-foss-4ecb014a9353d25d25249cceb268ee34eab0c96b_GL0.tar.gz) = 101281744