From nobody Fri Nov 15 15:57:52 2024 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 4XqhW51LQgz5dJ7D; Fri, 15 Nov 2024 15:57:53 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XqhW46jJZz4CVf; Fri, 15 Nov 2024 15:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731686272; 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=0sfyLFvi7Y+FA563SZomK2bmJ7Nwj/s5o4HS97uWMJo=; b=crCinUdha7yIe7QZVp3gBKzWqEsVg4T0ivqMSmTJQ6y6M3JzNtwNuvSceKWEFbPgAiGJ82 FI4l4F8mh0pQO+lckL07vuvg7qYw9ZHQKdH81+w2/rDb/6H1NllNbTKkYSJaJa18GVJ+Yr 06ViqIFIYtPZhBEhrIFYOSqoGEZirKcUiz0ttMXA6g0k8zxvgHmheJcVA1S67fqH5MU6iC ywNWUnh2k8qlCi6wSBAxODFQQ4wjiamQo4qTNpRY3mU+zlscoGOToMBwuo5V0NLc5FCPo+ YEx1PLnG5el57UU1jVwn+PflPfXm/FhHE4Sm6gu4tFDoCT/CBw1aE9n+v1G/OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731686272; 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=0sfyLFvi7Y+FA563SZomK2bmJ7Nwj/s5o4HS97uWMJo=; b=Xv0OHWm46g2+ABr5XRlNZNv7tjBs0qh/axnOqjehCeyc/D1JQTfx0k4J2KPpSkUMdQYT7g Ap6dRqfcWh46hDWZF+DGFk20tE8VWgDZIx0EgiaJ8u77W1iZr//YsIVV7qfi2MdfSd7650 pcl6qu+lLNpa9/D7p+m5H9oCUr6R0ZgFVpKlnSHuzCyAjeAVyGS3eIx/sWqsdvQCRl85s4 BOdEwSPOtrOzsl8mR8ocl7yPfs9kO+tJ24JzFFHlqFIMoqNJ76gh8dGn1OrSv/C+hBqHeT fm014P+uPcENty56UTT0Ikr2cghkTjikO1kZJ0P/tFGc0KGzuCVbuWdiO+BjBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731686272; a=rsa-sha256; cv=none; b=K5dZL96wPfODFuL4DEsDyyLH6F3QcU40YKfUFJz1IftRYY6NeWuUTUe3rsYf0bAU1+b1Ej RcXhepkhVp4TANVuzaGiFLDFwppMGk93rwolswkPLDzgZOGfQHWYF7KvK7MyIwpIHMgz+N caGT5ZI50sZ9fU4EIjqe92sNzpAFvJn+x/5nr5RZeKs4Sq6xePxbdwEM+tT1fGsj5qgxsO tJlw7JLOEPB4I1JTt+WgIjqXfCoNOo7OL3zab9zdpwRh5QJ9RNjPEYfaMEYopasb5Cr+rq lV0Y4uk/wsYVSKUCuUENfPbeOMbfRu1aeXenBtL9PlVCJFjX52dXuulRs6wPXw== 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 4XqhW46HT7zTxk; Fri, 15 Nov 2024 15:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AFFvqh5094666; Fri, 15 Nov 2024 15:57:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AFFvqnp094663; Fri, 15 Nov 2024 15:57:52 GMT (envelope-from git) Date: Fri, 15 Nov 2024 15:57:52 GMT Message-Id: <202411151557.4AFFvqnp094663@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: 3f96b1a7b333 - 2024Q4 - www/gitlab: fix regression from 372f5ebfd99a96b7060145c632e350b5870b8c7d 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 3f96b1a7b333207b700c94f5425341c765ce9139 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f96b1a7b333207b700c94f5425341c765ce9139 commit 3f96b1a7b333207b700c94f5425341c765ce9139 Author: Matthias Fechner AuthorDate: 2024-11-05 07:34:22 +0000 Commit: Matthias Fechner CommitDate: 2024-11-15 15:56:44 +0000 www/gitlab: fix regression from 372f5ebfd99a96b7060145c632e350b5870b8c7d ===> gitlab-ce-17.5.1_1 depends on package: rubygem-webrick>=1.8.1<1.9 - not found *** Error code 1 (cherry picked from commit 1ca2b6ee37797cf857b6201b5265e9f78628ac55) --- www/gitlab/Makefile | 2 +- www/gitlab/Makefile.common | 2 +- www/gitlab/files/patch-Gemfile | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 0f2eae8a1f53..f30b1e8d9251 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -223,7 +223,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-tty-prompt>=0.23<1:devel/rubygem-tty-prompt \ rubygem-peek-rails70>=1.1<2.0:devel/rubygem-peek-rails70 \ rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \ - rubygem-webrick>=1.8.1<1.9:www/rubygem-webrick \ + rubygem-webrick>=1.8.1<1.10:www/rubygem-webrick \ rubygem-prometheus-client-mmap>=1.1.1<2:devel/rubygem-prometheus-client-mmap \ rubygem-async212>=2.12.1<2.13:devel/rubygem-async212 \ rubygem-gitlab-security_report_schemas>=0.1.2.min15.0.0.max15.2.1<0.1.2.min15.0.0.max15.2.2:devel/rubygem-gitlab-security_report_schemas \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 4dcefc11a462..b33919892445 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ GITLAB_VERSION= 17.5.1 -GITLAB_PORTREVISION= 1 +GITLAB_PORTREVISION= 2 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index a8c5098e445b..8254fe335591 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2024-10-16 08:01:39 UTC +--- Gemfile.orig 2024-10-22 18:38:20 UTC +++ Gemfile @@ -160,7 +160,7 @@ gem 'graphql', '~> 2.3.14', feature_category: :api @@ -45,6 +45,15 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', +@@ -424,7 +424,7 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemf + gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory + + # Metrics +-gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'webrick', '~> 1.8', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory + + # Event-driven reactor for Ruby @@ -466,136 +466,15 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory