From nobody Thu Jan 12 09:53:35 2023 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 4Nt0HM50xhz2p8sS; Thu, 12 Jan 2023 09:53:35 +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 4Nt0HM1vyZz45XX; Thu, 12 Jan 2023 09:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673517215; 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=LP5t4h7Ep2Y8+V7QT0w+O0q9wLsBJkMKCYIN6lYvvKg=; b=otOXdOAZX+caAs9sfCoCMtO1fi70c7yO5C5IUqnX0w0UUkCnrqI0yW00u2Lwj87OtS0xQ/ +DwEWCrSCJar5q4w2D2ivx+psIXUaFNZJjT3NDHE7FNiLphjOVTbN5DVsSHpZu9wsrfjZw o+qxpAje6/s938fc0Rj1SJAuUuIMrVFsHQCL+QKQcxiM7W1DfQiDbd1HMFrbM5c6QZAtKm wXmF/KS0cyxSIkbKqp4650Zgx4EnLjpzN0Y3aekzl8TytHi+a3rGOnu5ir17XTOWV+oX7O DZmSbBlN/9mMQ4HONeFBHFiMTeWuqm4ttPVr0liwY2ZXsHJOI6OWTP60ns2fGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673517215; 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=LP5t4h7Ep2Y8+V7QT0w+O0q9wLsBJkMKCYIN6lYvvKg=; b=R4al+cxO8dCWf//MKHqXipYb6XnIOaquCYHIYYA24iv/3rTpgMEdEGH2PtFAXBhI6u+DjT g8MfKCYkICaTPVJlVAjKdy6osyE+JaWU4R7P5NHeUgbpZdU59J6YQi6TPw+wnxCUFnh/rS mHD9tJskxlToqCyX2EarJ0RGK/WynWFcEnZRqzCkWVYZzqaP2u+md0Qsofch0RfIOugvRx fdPxJd8Jiie09EAf23pnGo61r6xq2yL5fnK8CvYWzY4JgTDh/PAMIvWruJIFFjNamJL8mh Glq/CYRL8BjfKeYzr0gzUuqnge3kMh2hI2V50vRfHLge2lmi0lsebuPVKYHkfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673517215; a=rsa-sha256; cv=none; b=hB22D2fR33pT+6g64i+BcSu5GIu7pKdXUqlgZGZV00eDOL+YIUrVqCcDnLjZxzEuSN08Hy kmStzN97wslIU+htTiZlyfzcwcK3/sZ7fhxnuhdzoNoJuD6/o/O42WM7cqY+6y3CC+E9Vh LGWVZk0HlnYL2sWbRKJtsJGFeX3U6Ab/MYoVGJNJ2rx6yVPIqPJFuF0JtHMdJbepQFO/11 2QeTuIff3J+8f7hz0BSSG9Vo9kfS2Kbd2Jz0onTJ7iboBEij3MD2xLSjF8+0HDl4HZBWcr BNuHfpA4o1RmFQDJQwbX/fmz5xqfa4snJp3IKrBEwQ+SEOvnVatNlPzFE0NNHA== 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 4Nt0HM11SZzNh7; Thu, 12 Jan 2023 09:53:35 +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 30C9rZrV093568; Thu, 12 Jan 2023 09:53:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30C9rZPK093567; Thu, 12 Jan 2023 09:53:35 GMT (envelope-from git) Date: Thu, 12 Jan 2023 09:53:35 GMT Message-Id: <202301120953.30C9rZPK093567@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: d0c05422c14a - 2023Q1 - www/gitlab-ce: security update to 15.6.4 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/2023Q1 X-Git-Reftype: branch X-Git-Commit: d0c05422c14a51d13e4e148ddd0e7c68051ed880 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0c05422c14a51d13e4e148ddd0e7c68051ed880 commit d0c05422c14a51d13e4e148ddd0e7c68051ed880 Author: Matthias Fechner AuthorDate: 2023-01-10 19:46:55 +0000 Commit: Matthias Fechner CommitDate: 2023-01-12 06:00:39 +0000 www/gitlab-ce: security update to 15.6.4 Changelog: https://about.gitlab.com/releases/2022/11/30/security-release-gitlab-15-6-1-released/ https://about.gitlab.com/releases/2022/12/02/gitlab-15-6-2-released/ https://about.gitlab.com/releases/2022/12/16/gitlab-15-6-3-released/ https://about.gitlab.com/releases/2023/01/09/security-release-gitlab-15-7-2-released/ (cherry picked from commit 92e26e167985700b7383fccefc809dddf680b904) --- devel/gitaly/Makefile | 6 +++--- devel/gitaly/distinfo | 10 +++++----- www/gitlab-ce/Makefile | 6 +++--- www/gitlab-ce/distinfo | 6 +++--- www/gitlab-ce/files/patch-Gemfile | 10 +++++----- .../files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb | 11 +++++++++++ www/gitlab-workhorse/Makefile | 4 ++-- www/gitlab-workhorse/distinfo | 10 +++++----- 8 files changed, 37 insertions(+), 26 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 27046d6d142c..7870e3c7793f 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 15.6.0 +DISTVERSION= 15.6.4 PORTREVISION= 0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # it fixes segfaults reported here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259848 # define dependencies that are required for build and run under MY_DEPENDS -MY_DEPENDS= git>=2.37.0:devel/git \ +MY_DEPENDS= git>=2.37.4:devel/git \ rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \ rubygem-rugged>=1.2<2:devel/rubygem-rugged \ rubygem-github-linguist>=7.23<8:textproc/rubygem-github-linguist \ @@ -50,7 +50,7 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 35525237b47fcc0e4b2b34502a851e1ea1fdd8a4 +GL_COMMIT= be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96 # 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 68b6f776bbf4..0c1ba217771a 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1669472360 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-35525237b47fcc0e4b2b34502a851e1ea1fdd8a4_GL0/go.mod) = f462be9eb2e9aefb06785123fade2685a03f9cc6e52b99490e734e50ce892e2c -SIZE (go/devel_gitaly/gitlab-org-gitaly-35525237b47fcc0e4b2b34502a851e1ea1fdd8a4_GL0/go.mod) = 9783 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-35525237b47fcc0e4b2b34502a851e1ea1fdd8a4_GL0/gitlab-org-gitaly-35525237b47fcc0e4b2b34502a851e1ea1fdd8a4_GL0.tar.gz) = 9d887a02af6ccce05f6b29ca7867bb02d38379d09b0fc2a23fcea4d3a962ed43 -SIZE (go/devel_gitaly/gitlab-org-gitaly-35525237b47fcc0e4b2b34502a851e1ea1fdd8a4_GL0/gitlab-org-gitaly-35525237b47fcc0e4b2b34502a851e1ea1fdd8a4_GL0.tar.gz) = 2909541 +TIMESTAMP = 1673369099 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96_GL0/go.mod) = f462be9eb2e9aefb06785123fade2685a03f9cc6e52b99490e734e50ce892e2c +SIZE (go/devel_gitaly/gitlab-org-gitaly-be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96_GL0/go.mod) = 9783 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96_GL0/gitlab-org-gitaly-be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96_GL0.tar.gz) = 450eabeb8fb61634dd83b83a34f2e226eaa2cebc054babc153eb7c7b07b84f92 +SIZE (go/devel_gitaly/gitlab-org-gitaly-be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96_GL0/gitlab-org-gitaly-be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96_GL0.tar.gz) = 2910993 diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 6668e648eb29..fa2f066470cd 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-ce -PORTVERSION= 15.6.0 +PORTVERSION= 15.6.4 PORTREVISION= 0 CATEGORIES= www devel @@ -192,7 +192,7 @@ MY_DEPENDS= git>=2.37.0:devel/git \ rubygem-sentry-sidekiq>=5.1.1<5.2:devel/rubygem-sentry-sidekiq \ rubygem-pg_query>=2.2<3:databases/rubygem-pg_query \ rubygem-premailer-rails-rails61>=1.10.3<1.11:mail/rubygem-premailer-rails-rails61 \ - rubygem-gitlab-labkit>=0.28.0<0.29:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.29.0<0.30:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.16.0:devel/rubygem-thrift \ rubygem-ruby_parser>=3.15<4.0:devel/rubygem-ruby_parser \ rubygem-rails-i18n-rails61>=7.0<8:devel/rubygem-rails-i18n-rails61 \ @@ -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= 7f1a7c62df90aa19155a623b4e6cae73c5d5fc0b +GL_COMMIT= 201805ee2af83fc75bb50ee8a10aa24f563bb2f4 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 03d97c9d7ee7..dc3b14bbaf78 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669453495 -SHA256 (gitlab-org-gitlab-foss-7f1a7c62df90aa19155a623b4e6cae73c5d5fc0b_GL0.tar.gz) = 7723ea178284503fec3771102a3c08c33728ca669cea0fa299ef5fa292df7b9c -SIZE (gitlab-org-gitlab-foss-7f1a7c62df90aa19155a623b4e6cae73c5d5fc0b_GL0.tar.gz) = 98454507 +TIMESTAMP = 1673368605 +SHA256 (gitlab-org-gitlab-foss-201805ee2af83fc75bb50ee8a10aa24f563bb2f4_GL0.tar.gz) = e78430fac1a4cd33e15912ca95864b436e22470130df016bc68e26790210b1d2 +SIZE (gitlab-org-gitlab-foss-201805ee2af83fc75bb50ee8a10aa24f563bb2f4_GL0.tar.gz) = 98462350 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index f40936dd9044..14770487e4d4 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2022-11-21 09:46:38 UTC +--- Gemfile.orig 2023-01-09 12:50:34 UTC +++ Gemfile @@ -13,9 +13,9 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems # NOTE: When incrementing the major or minor version here, also increment activerecord_version @@ -71,7 +71,7 @@ # HTTP requests gem 'httparty', '~> 0.20.0' -@@ -353,119 +353,23 @@ gem 'batch-loader', '~> 2.0.1' +@@ -352,119 +352,23 @@ gem 'batch-loader', '~> 2.0.1' gem 'peek', '~> 1.1' # Snowplow events tracking @@ -193,7 +193,7 @@ gem 'octokit', '~> 4.15' # Updating this gem version here is deprecated. See: -@@ -512,7 +416,7 @@ gem 'google-protobuf', '~> 3.21', '>= 3.21.9' +@@ -511,7 +415,7 @@ gem 'google-protobuf', '~> 3.21', '>= 3.21.9' gem 'toml-rb', '~> 2.2.0' # Feature toggles @@ -202,7 +202,7 @@ gem 'flipper-active_record', '~> 0.25.0' gem 'flipper-active_support_cache_store', '~> 0.25.0' gem 'unleash', '~> 3.2.2' -@@ -548,7 +452,7 @@ gem 'lockbox', '~> 0.6.2' +@@ -547,7 +451,7 @@ gem 'lockbox', '~> 0.6.2' gem 'valid_email', '~> 0.1' # JSON @@ -211,7 +211,7 @@ gem 'json_schemer', '~> 0.2.18' gem 'oj', '~> 3.13.21' gem 'oj-introspect', '~> 0.7' -@@ -569,6 +473,8 @@ gem 'ed25519', '~> 1.3.0' +@@ -568,6 +472,8 @@ gem 'ed25519', '~> 1.3.0' # Error Tracking OpenAPI client # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api' diff --git a/www/gitlab-ce/files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb b/www/gitlab-ce/files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb new file mode 100644 index 000000000000..c8818844543b --- /dev/null +++ b/www/gitlab-ce/files/patch-lib_gitlab_patch_sidekiq__cron__poller.rb @@ -0,0 +1,11 @@ +--- lib/gitlab/patch/sidekiq_cron_poller.rb.orig 2023-01-10 20:21:22 UTC ++++ lib/gitlab/patch/sidekiq_cron_poller.rb +@@ -7,7 +7,7 @@ + require 'sidekiq/version' + require 'sidekiq/cron/version' + +-if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.7') ++if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.8') + raise 'New version of sidekiq detected, please remove or update this patch' + end + diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index c06b9401b045..bada1fc0424b 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-workhorse -PORTVERSION= 15.6.0 +PORTVERSION= 15.6.4 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= 7f1a7c62df90aa19155a623b4e6cae73c5d5fc0b +GL_COMMIT= 201805ee2af83fc75bb50ee8a10aa24f563bb2f4 # 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 a204baecb3e3..2c4ff2acad34 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1669453575 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-7f1a7c62df90aa19155a623b4e6cae73c5d5fc0b_GL0/go.mod) = 665bfba860299adfbec2ca2d57f5cd6fbc7c9637a8a27d7e71de63ee43d18418 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-7f1a7c62df90aa19155a623b4e6cae73c5d5fc0b_GL0/go.mod) = 6403 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-7f1a7c62df90aa19155a623b4e6cae73c5d5fc0b_GL0/gitlab-org-gitlab-foss-7f1a7c62df90aa19155a623b4e6cae73c5d5fc0b_GL0.tar.gz) = 7723ea178284503fec3771102a3c08c33728ca669cea0fa299ef5fa292df7b9c -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-7f1a7c62df90aa19155a623b4e6cae73c5d5fc0b_GL0/gitlab-org-gitlab-foss-7f1a7c62df90aa19155a623b4e6cae73c5d5fc0b_GL0.tar.gz) = 98454507 +TIMESTAMP = 1673370238 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-201805ee2af83fc75bb50ee8a10aa24f563bb2f4_GL0/go.mod) = 665bfba860299adfbec2ca2d57f5cd6fbc7c9637a8a27d7e71de63ee43d18418 +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-201805ee2af83fc75bb50ee8a10aa24f563bb2f4_GL0/go.mod) = 6403 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-201805ee2af83fc75bb50ee8a10aa24f563bb2f4_GL0/gitlab-org-gitlab-foss-201805ee2af83fc75bb50ee8a10aa24f563bb2f4_GL0.tar.gz) = e78430fac1a4cd33e15912ca95864b436e22470130df016bc68e26790210b1d2 +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-201805ee2af83fc75bb50ee8a10aa24f563bb2f4_GL0/gitlab-org-gitlab-foss-201805ee2af83fc75bb50ee8a10aa24f563bb2f4_GL0.tar.gz) = 98462350