From nobody Thu Dec 8 07:15:23 2022 X-Original-To: dev-commits-ports-all@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 4NSQQz6YWFz4jwnj; Thu, 8 Dec 2022 07:15:23 +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 4NSQQz63Wcz3ssy; Thu, 8 Dec 2022 07:15:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670483723; 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=zlt/t17ULTBSRVcx3l4c/3pz3dOk7uTKsqbpmi2ol8I=; b=JQuXGk5cudNP1wQNqb4e1oU/u69gHRCitzUbYaAG+9n77NVa5rSCyhpu9yMDkVu9u98lVf TIXPBjQgVKHXp3TwOJ1/MPtw+pzpwrgtlBmdcN0lJIturkb2xmJDyMm9FxrW4j98dqGPu0 5pg85c6RSUhcDnWljuRS/Twu+nTI0GxOHRNZ40lD0gaRJjJbq399RgyONTfQp+zUOmiu27 mcFyUGPKjyBiezDEGvMKi10wObVGl5NhARHo12ktjp6TpVGyChvKhPurOqpbRSwGDohXUg doGAvPy6yu7oGCeF51t3zCU2koRJQWO8klrXvJx1a8mN43ox6jF9FaZ4JelNqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670483723; 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=zlt/t17ULTBSRVcx3l4c/3pz3dOk7uTKsqbpmi2ol8I=; b=HxxT7R+dOJFzBIhATtsAtJA/JseX5vOK9avLQBB2U2/0wvHRUIpOZre/eJGLOGgjeQsKc8 cbke/cvxgfSZd4Y/D6EqTyjEgmJWlSQc81L9AfEa+Qj2doS0YaS4dH6UkYXZx9ngACP8lN JNbEySvm3v4i4Lg/iVLw6uo8BHTdIP41JznUp/x3Xc3NAymFzFAIp0uQT9tx1UmMUX81vQ PgA5ip1yyHvTJEMZRm/t2dV7zvYlS7FuwqPrDzEOMizQtXE8cjt3ppkkh3wBO+/PvbRhqn dxprbCbLWwibz/470aKdtALT3byPI450ogMYDt7X/z2ph9NI10d0//Vrps03ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670483723; a=rsa-sha256; cv=none; b=BW0A6tCZvfGfwaT+qMf0d5hC3sTT9AW4uCzdAVlR1v1N6BcBUQJEplC8SN7g38/2DTUjGK xRlzrGCzMCA3vnY5XNYELYPBb5wveD8JP5276UH8kCyOIDRK6NJ5bIoMvTGAAUBmRuOkfX 0onorpIzDIZzk3PD81GqwYPxi6f4tb8s3E5SuozWZuoXhr4U5lYXwNX7AAMOokTIOyS+pV 69CECAw7OLOygid0JwMEfLVRTUvLOIheedCUQYHQI7svD2v9mcVZqVFFOGn3OtUMwj4hsC 23g2mBeLIgg3+4riXcCTBJSJYFtKwiuWa86HKVOYLS8XVSXoXSKTjjdw9StAVQ== 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 4NSQQz54QGznBb; Thu, 8 Dec 2022 07:15:23 +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 2B87FNgE098916; Thu, 8 Dec 2022 07:15:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B87FNiK098915; Thu, 8 Dec 2022 07:15:23 GMT (envelope-from git) Date: Thu, 8 Dec 2022 07:15:23 GMT Message-Id: <202212080715.2B87FNiK098915@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: 94d26d39ae18 - main - www/gitlab-ce: security update to 15.5.6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 94d26d39ae18582ddc6182788d52bd34f8b80c74 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=94d26d39ae18582ddc6182788d52bd34f8b80c74 commit 94d26d39ae18582ddc6182788d52bd34f8b80c74 Author: Matthias Fechner AuthorDate: 2022-12-08 07:11:16 +0000 Commit: Matthias Fechner CommitDate: 2022-12-08 07:15:17 +0000 www/gitlab-ce: security update to 15.5.6 Changelog: https://about.gitlab.com/releases/2022/11/30/security-release-gitlab-15-6-1-released/ PR: 268103 Security: 3cde510a-7135-11ed-a28b-bff032704f00 --- devel/gitaly/Makefile | 4 ++-- devel/gitaly/distinfo | 10 +++++----- www/gitlab-ce/Makefile | 10 +++++----- www/gitlab-ce/distinfo | 6 +++--- www/gitlab-ce/files/patch-Gemfile | 32 ++++++++++++++------------------ www/gitlab-workhorse/Makefile | 4 ++-- www/gitlab-workhorse/distinfo | 10 +++++----- 7 files changed, 36 insertions(+), 40 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index da4e404f7b34..64880c1ee5f6 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 15.5.4 +DISTVERSION= 15.5.6 PORTREVISION= 0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -54,7 +54,7 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 631c94433ca5017be566bb65f4ac792ab672e956 +GL_COMMIT= 0380747ae595f37abb31ea65cca426b256733ae7 # 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 8b8a27c4ff85..9712ecbfef4a 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1668844707 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-631c94433ca5017be566bb65f4ac792ab672e956_GL0/go.mod) = 0517ea73ce81c02cb2a1ec0930bc828be37bd82038970b03d84e210c855a3ea1 -SIZE (go/devel_gitaly/gitlab-org-gitaly-631c94433ca5017be566bb65f4ac792ab672e956_GL0/go.mod) = 9532 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-631c94433ca5017be566bb65f4ac792ab672e956_GL0/gitlab-org-gitaly-631c94433ca5017be566bb65f4ac792ab672e956_GL0.tar.gz) = f05d698812d5eb4326a30c428459ea3a2eb0c0c3380ad6421e2a21d7560d5fc4 -SIZE (go/devel_gitaly/gitlab-org-gitaly-631c94433ca5017be566bb65f4ac792ab672e956_GL0/gitlab-org-gitaly-631c94433ca5017be566bb65f4ac792ab672e956_GL0.tar.gz) = 4150219 +TIMESTAMP = 1670479299 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-0380747ae595f37abb31ea65cca426b256733ae7_GL0/go.mod) = 0517ea73ce81c02cb2a1ec0930bc828be37bd82038970b03d84e210c855a3ea1 +SIZE (go/devel_gitaly/gitlab-org-gitaly-0380747ae595f37abb31ea65cca426b256733ae7_GL0/go.mod) = 9532 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-0380747ae595f37abb31ea65cca426b256733ae7_GL0/gitlab-org-gitaly-0380747ae595f37abb31ea65cca426b256733ae7_GL0.tar.gz) = a3060b0c94049099015da1b68c24e08b0f48c323e6ae492924402e6d19aabc5f +SIZE (go/devel_gitaly/gitlab-org-gitaly-0380747ae595f37abb31ea65cca426b256733ae7_GL0/gitlab-org-gitaly-0380747ae595f37abb31ea65cca426b256733ae7_GL0.tar.gz) = 4150641 diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 72e43382f90c..579c3662005a 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce -PORTVERSION= 15.5.4 -PORTREVISION= 1 +PORTVERSION= 15.5.6 +PORTREVISION= 0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -109,9 +109,9 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \ rubygem-elasticsearch-rails>=7.2<8:textproc/rubygem-elasticsearch-rails \ rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \ - rubygem-aws-sdk-core3159>=3.159.0<3.160:devel/rubygem-aws-sdk-core3159 \ + rubygem-aws-sdk-core>=3.159.0<3.169:devel/rubygem-aws-sdk-core \ rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \ - rubygem-aws-sdk-s31114>=1.114.0<1.115:devel/rubygem-aws-sdk-s31114 \ + rubygem-aws-sdk-s3>=1.114.0<1.118:devel/rubygem-aws-sdk-s3 \ rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \ rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \ rubygem-html-pipeline>=2.13.2<2.14:textproc/rubygem-html-pipeline \ @@ -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= ee1b34560d908f44af7ed9b3fbc8c56595bbae81 +GL_COMMIT= a2f39fb243f2ad2ba59939e2e6446ec9b19911f2 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 38d1265d50ad..63138071ae6a 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668836508 -SHA256 (gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0.tar.gz) = 651c6a6d1837824a9d8b023c2b93bcab4979ba0446c9b31e7f82b34abe739492 -SIZE (gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0.tar.gz) = 97980260 +TIMESTAMP = 1670479180 +SHA256 (gitlab-org-gitlab-foss-a2f39fb243f2ad2ba59939e2e6446ec9b19911f2_GL0.tar.gz) = 41ed73b637f139dec0e6d337f9e230cd3c20d50f6c7b34ddcf6078d9219d56cb +SIZE (gitlab-org-gitlab-foss-a2f39fb243f2ad2ba59939e2e6446ec9b19911f2_GL0.tar.gz) = 97978338 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index cd674634bdf5..62c17df1e4f9 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2022-11-11 19:24:20 UTC +--- Gemfile.orig 2022-12-07 19:22:40 UTC +++ Gemfile @@ -57,18 +57,18 @@ gem 'doorkeeper-openid_connect', '~> 1.7.5' gem 'rexml', '~> 3.2.5' @@ -41,14 +41,19 @@ # API gem 'grape', '~> 1.5.2' -@@ -220,16 +220,16 @@ gem 'state_machines-activerecord', '~> 0.8.0' - gem 'acts-as-taggable-on', '~> 9.0' - - # Background jobs --gem 'sidekiq', '~> 6.4.0' -+gem 'sidekiq', '~> 6.4.0' - gem 'sidekiq-cron', '~> 1.8.0' - gem 'redis-namespace', '~> 1.9.0' +@@ -168,9 +168,9 @@ gem 'seed-fu', '~> 2.3.7' + gem 'elasticsearch-model', '~> 7.2' + gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' + gem 'elasticsearch-api', '7.13.3' +-gem 'aws-sdk-core', '~> 3.159.0' ++gem 'aws-sdk-core', '~> 3.159' + gem 'aws-sdk-cloudformation', '~> 1' +-gem 'aws-sdk-s3', '~> 1.114.0' ++gem 'aws-sdk-s3', '~> 1.114' + gem 'faraday_middleware-aws-sigv4', '~>0.3.0' + gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections + +@@ -226,10 +226,10 @@ gem 'redis-namespace', '~> 1.9.0' gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch' # Cron Parser @@ -201,15 +206,6 @@ gem 'octokit', '~> 4.15' # Updating this gem version here is deprecated. See: -@@ -503,7 +407,7 @@ gem 'ssh_data', '~> 1.3' - gem 'spamcheck', '~> 1.0.0' - - # Gitaly GRPC protocol definitions --gem 'gitaly', '~> 15.4.0-rc2' -+gem 'gitaly', '>= 15.4.0-rc2' - - # KAS GRPC protocol definitions - gem 'kas-grpc', '~> 0.0.2' @@ -515,7 +419,7 @@ gem 'google-protobuf', '~> 3.21' gem 'toml-rb', '~> 2.2.0' diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index d990623b2bde..c118e080e62e 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-workhorse -PORTVERSION= 15.5.4 +PORTVERSION= 15.5.6 PORTREVISION= 0 DISTVERSIONPREFIX= v CATEGORIES= www @@ -25,7 +25,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= ee1b34560d908f44af7ed9b3fbc8c56595bbae81 +GL_COMMIT= a2f39fb243f2ad2ba59939e2e6446ec9b19911f2 # 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 61ed238bd6c4..774fc0e47fd3 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1668836587 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0/go.mod) = d5b6ced60bc032bc69300e405a6788e953abf6a9b29bbd2099f1aeffe6ebfd0e -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0/go.mod) = 6131 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0/gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0.tar.gz) = 651c6a6d1837824a9d8b023c2b93bcab4979ba0446c9b31e7f82b34abe739492 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0/gitlab-org-gitlab-foss-ee1b34560d908f44af7ed9b3fbc8c56595bbae81_GL0.tar.gz) = 97980260 +TIMESTAMP = 1670479226 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2f39fb243f2ad2ba59939e2e6446ec9b19911f2_GL0/go.mod) = d5b6ced60bc032bc69300e405a6788e953abf6a9b29bbd2099f1aeffe6ebfd0e +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2f39fb243f2ad2ba59939e2e6446ec9b19911f2_GL0/go.mod) = 6131 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2f39fb243f2ad2ba59939e2e6446ec9b19911f2_GL0/gitlab-org-gitlab-foss-a2f39fb243f2ad2ba59939e2e6446ec9b19911f2_GL0.tar.gz) = 41ed73b637f139dec0e6d337f9e230cd3c20d50f6c7b34ddcf6078d9219d56cb +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-a2f39fb243f2ad2ba59939e2e6446ec9b19911f2_GL0/gitlab-org-gitlab-foss-a2f39fb243f2ad2ba59939e2e6446ec9b19911f2_GL0.tar.gz) = 97978338