From nobody Mon Jun 05 19:02:01 2023 X-Original-To: dev-commits-ports-main@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 4QZjdk2L1nz4b0RT; Mon, 5 Jun 2023 19:02:02 +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 4QZjdk1WnXz3Pdc; Mon, 5 Jun 2023 19:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685991722; 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=XRqjv9Hnrghxto89FR5mVWQ5yRhnZTXrGXnDAdhSXFY=; b=I+mgkoSf91UUfMMkIc4ARAvP7N88mBiQNwITxzctpnzBcoff8KbjZuX79qmU1JqtWZhw6Y L21JM6ha30ULWhhXZERyZpixYy0PMpWo0//QdO/Da6tytr6zHn9NZiNxqpiaWO02utkpfL LVHaQQfQi1nRAWobzV1oFWPrOGnbx+m3f9lanlaANki7yCmCl8PC0r6ylBlbjbiOqc1DiX 5Lw3T83uwO1jrqLepfGShlq8gSxP83Bm7hXHFYrWRl43mis1f11nVwFTR3cFictYxl4t0y CxL07UHMEtE69TPN5ybmjr/g2a7OEK4LUdgVsJRheWgPql8xT5L3WlmicGVWEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685991722; 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=XRqjv9Hnrghxto89FR5mVWQ5yRhnZTXrGXnDAdhSXFY=; b=LS3Q5bEKmuVcDlfE57wefdd6T2Qns26/jSGnSn9c7yv4vVkSEnk6Zq9E15GUyxAf6lLkmj ID8VzfWJ9DSvG5gDmMudaoLqUCozsgmWdURVcOxABgpcZiBytHYNykXTdnhJcKTXq+0v8u Rsmu426FjXQYzTfxwJdIyYUwSW9tHVzhwcAIm9tXhZmL7PFI5Ntp7GUafCVWcwiNNWABXo 93bJlXIcYAa2Owsw/I3GEn1nMIh3dREK46jf1BhmpxMlMOwDEHGrQQaaIYnyHastbd2ygX /MHOb0cYrvXnIUdgDLN9mlw/Ycif/sUCqh3wT9P5aUEGnUmypkTbKiCgUqguRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685991722; a=rsa-sha256; cv=none; b=lm8bZHuw/Eov/uGCBUXVeW/1xlTKOCguy1X2f62eqUGjIIHHKbjKlrnsdUwNPcPPYj1koh ZmG7hFBL6lFSa4wouF2IHCwp+lKhksaJqlJx33D5TMYWHACdzurUKbNAmIKTc74dXIIU7o 0nXTtOfh0VwUc6tgXs8NogJEFq7jaWxk0cNz8N2BiVa7ZatN+h0LB5qYVp2V60wvleRk4F vD1/t0ZyM7sbHR1wPtFDO9RxRJmzEsgLWU1E+BFATG0V4HGVIZbFutwxIfYoMWjTklrJTQ 3LZsG08ZNFm78lCiIathLkJDJOcmq9gEL4R1YYmeE0hQTs4Cg1zyPozF7braKQ== 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 4QZjdk0WvJz10QR; Mon, 5 Jun 2023 19:02:02 +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 355J21BM079039; Mon, 5 Jun 2023 19:02:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 355J21P1079038; Mon, 5 Jun 2023 19:02:01 GMT (envelope-from git) Date: Mon, 5 Jun 2023 19:02:01 GMT Message-Id: <202306051902.355J21P1079038@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: cd3ccf540775 - main - www/gitlab-ce: Update RUN_DEPENDS List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd3ccf5407757430ac5899a4ba0fecd61992a431 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd3ccf5407757430ac5899a4ba0fecd61992a431 commit cd3ccf5407757430ac5899a4ba0fecd61992a431 Author: Po-Chuan Hsieh AuthorDate: 2023-06-05 18:46:23 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-05 18:49:13 +0000 www/gitlab-ce: Update RUN_DEPENDS - Change RUN_DEPENDS from rubygem-aws-sdk-s3 to rubygem-aws-sdk-s31122 - Change RUN_DEPENDS from rubygem-nokogiri to rubygem-nokogiri114 - Change RUN_DEPENDS from rubygem-rack227 to rubygem-rack22 - Bump PORTREVISION for dependency change --- www/gitlab-ce/Makefile | 8 ++++---- www/gitlab-ce/files/patch-Gemfile | 11 ++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 2033b5434acf..84a7195b6ffa 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 16.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -121,7 +121,7 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \ rubygem-aws-sdk-core3172>=3.172.0<3.173:devel/rubygem-aws-sdk-core3172 \ rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \ - rubygem-aws-sdk-s3>=1.122.0<1.123:devel/rubygem-aws-sdk-s3 \ + rubygem-aws-sdk-s31122>=1.122.0<1.123:devel/rubygem-aws-sdk-s31122 \ 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.14.3<2.15:textproc/rubygem-html-pipeline \ @@ -140,11 +140,11 @@ MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-asciidoctor-kroki>=0.8.0<0.9:textproc/rubygem-asciidoctor-kroki \ rubygem-rouge>=4.1.0<4.2:textproc/rubygem-rouge \ rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \ - rubygem-nokogiri>=1.14.3<1.15:textproc/rubygem-nokogiri \ + rubygem-nokogiri114>=1.14.3<1.15:textproc/rubygem-nokogiri114 \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy>=3.4<4:textproc/rubygem-diffy \ rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \ - rubygem-rack227>=2.2.7<2.3:www/rubygem-rack227 \ + rubygem-rack22>=2.2.7,3<2.3,3:www/rubygem-rack22 \ rubygem-rack-timeout>=0.6.3<0.7:www/rubygem-rack-timeout \ rubygem-puma>=5.6.5<5.7:www/rubygem-puma \ rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \ diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index c754348f488d..cf6bd0bf11c5 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2023-05-18 16:48:55 UTC +--- Gemfile.orig 2023-05-22 18:44:12 UTC +++ Gemfile @@ -35,7 +35,7 @@ gem 'neighbor', '~> 0.2.3' gem 'rugged', '~> 1.5' @@ -38,6 +38,15 @@ gem 'google-apis-compute_v1', '~> 0.57.0' gem 'google-apis-container_v1', '~> 0.43.0' gem 'google-apis-container_v1beta1', '~> 0.43.0' +@@ -172,7 +172,7 @@ 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.172.0' ++gem 'aws-sdk-core', '~> 3.172' + gem 'aws-sdk-cloudformation', '~> 1' + gem 'aws-sdk-s3', '~> 1.122.0' + gem 'faraday_middleware-aws-sigv4', '~>0.3.0' @@ -274,7 +274,7 @@ gem 'slack-messenger', '~> 2.3.4' gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'