From nobody Wed Aug 07 07:37:44 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 4Wf2885dXdz5Srm2; Wed, 07 Aug 2024 07:37:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wf28855Lmz4D0f; Wed, 7 Aug 2024 07:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723016264; 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=UNp3gyZR3LG1AS7xK4qpRPIX/j2hX7ylZRAbfnHMTtc=; b=Ec5NJAAGR6EGkT13yg601F98MsGqPN56k7EIJgOTirbqEwQO69AIWc864FL/HLti5jTQ5S ZRUGRFjlcy10MkKDRTqyTDm2FDpdwmj+wf9rfzLk3MlrK3NyETypqTSXCd/wJi/w6EscKj clZkVpHeHlKyYbJR6LIbaGiIC8WQPnGThSG6PmqveJBsf5RWtnDkUHrYi8E0Vg0Mpm85nA HSE4eT+LTfLcR78bj6XR3330Nw91/L0NUSUo0aw5CQn4qsIxWJQExpyrOEWRxyoVJUWLmL UjjPR2o5tobT4IPCnVF3t/Zb+HdumhuW62sgk/Q8Vff5gvWZf/vTBDF/uMnxWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723016264; a=rsa-sha256; cv=none; b=qXbRg5HX3zbwW8IalTOWEvKIKW9zdwlvlP16s0jIweiYzo2+DBYPJNsJwevCZn2lShZtAq IpFV/tex7kbRk7U/cqM4iPoWVFtB8sHt3T3lItfq0SXWyHfYTaQCvp6PCh5nQi+MM9Iq6s stqmlP1V2hUVWhCojEa20Mqz6o39knXXBSdr/rcCMfkT1taYsrLMFler25mrVYkhInHHeq NALRUr39iQHQuhWbtTm2cqcynYu0mjYRsoBhgJ2aNLgIc2J+HEv+NbgfPuFsw26nTNL+i4 1NAbZvzsProUF4FbDdWLPeUrioq8yOcoasISdcSnvOGK/fMwPj7VRgN3y+hOZg== 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=1723016264; 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=UNp3gyZR3LG1AS7xK4qpRPIX/j2hX7ylZRAbfnHMTtc=; b=ulLg39rlIcEw2J0nMt//OqRoqmsZDLSQ4fxVs2kQP29m+PntpLT9qIq39a5aJtVoDIjQDu iWo4iRPc27iYiaRQfObfV46bWcQ3FzjK+INuwYTAHg3drDuq4fRp9lME2EHTCHInTzt9Lq /+03JFJcPc3m5ZwnrW57jk4rzhcYKhFb9AUvhkKML5D9yC++/p2P122XxkjAdZr4T4XYxJ FWBaJ++MM3c43GZJyh8YZRL/MZ1OF31CrEdCfa1IAPhO2vmPld3DpiD/JfUwngK7xx2sGL B+zV/1VrNR4dJbpKs+pzyE7aXzAEImWmxPqhk4WPIfDNRMegsZ00FVhWpB65Gw== 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 4Wf2884hCpzgnb; Wed, 7 Aug 2024 07:37:44 +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 4777biYo007866; Wed, 7 Aug 2024 07:37:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4777bixd007863; Wed, 7 Aug 2024 07:37:44 GMT (envelope-from git) Date: Wed, 7 Aug 2024 07:37:44 GMT Message-Id: <202408070737.4777bixd007863@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: a5e529d6a767 - main - www/gitlab: fix regression from 09d7eada6c2c214adac9780307f2dd7689ab8660 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/main X-Git-Reftype: branch X-Git-Commit: a5e529d6a767023c10d083c7ad441ad464b01c1e Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5e529d6a767023c10d083c7ad441ad464b01c1e commit a5e529d6a767023c10d083c7ad441ad464b01c1e Author: Matthias Fechner AuthorDate: 2024-08-05 07:26:08 +0000 Commit: Matthias Fechner CommitDate: 2024-08-07 07:37:05 +0000 www/gitlab: fix regression from 09d7eada6c2c214adac9780307f2dd7689ab8660 Gitlab requires cssbundling 1.4.0. As changelog of cssbundling seems not to have a breaking change, allow 1.4.x. That patch is not approved from upstream and needs to be tested carefully. PR: 280621 --- www/gitlab/Makefile | 2 +- www/gitlab/files/patch-Gemfile | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 7a27fdec9fe9..54ce7379b9dc 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -4,7 +4,7 @@ DISTVERSIONPREFIX= v .if ${FLAVOR:U} == ee DISTVERSIONSUFFIX= -ee .endif -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www devel # include patch to fix database migration diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index dd9d6e0337c8..61391c85d487 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2024-06-25 20:33:28 UTC +--- Gemfile.orig 2024-07-24 01:20:50 UTC +++ Gemfile @@ -58,7 +58,7 @@ gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingF @@ -81,7 +81,16 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -431,96 +431,10 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi +@@ -345,7 +345,7 @@ gem 'rack-proxy', '~> 0.7.7' # rubocop:todo Gemfile/Mi + + gem 'rack-proxy', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory + +-gem 'cssbundling-rails', '1.4.0', feature_category: :shared ++gem 'cssbundling-rails', '~> 1.4.0', feature_category: :shared + gem 'terser', '1.0.2' # rubocop:todo Gemfile/MissingFeatureCategory + + gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' # rubocop:todo Gemfile/MissingFeatureCategory +@@ -433,96 +433,10 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -178,7 +187,7 @@ # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory -@@ -532,36 +446,6 @@ end +@@ -534,36 +448,6 @@ end gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling end @@ -215,7 +224,7 @@ gem 'octokit', '~> 8.1', feature_category: :importers gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared -@@ -594,7 +478,7 @@ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/Mis +@@ -596,7 +480,7 @@ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/Mis gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Gitaly GRPC protocol definitions @@ -224,7 +233,7 @@ # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management -@@ -620,7 +504,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil +@@ -622,7 +506,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory # Countries list @@ -233,7 +242,7 @@ gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -686,6 +570,7 @@ gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemf +@@ -688,6 +572,7 @@ gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemf gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory # BufferedIO patch @@ -241,7 +250,7 @@ # Updating this version will require updating scripts/allowed_warnings.txt gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -694,5 +579,11 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing +@@ -696,5 +581,11 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing gem 'net-http', '= 0.4.1', feature_category: :shared gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory