From nobody Thu Jul 20 04:56:23 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 4R60lC2VCGz4nL0f; Thu, 20 Jul 2023 04:56: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 4R60lC21CDz3JlP; Thu, 20 Jul 2023 04:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689828983; 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=dl1TDHNWbrmB0evW3sXJX13kBGFtVaQm8NuZNuV+a2Q=; b=lm75JeJTzH7lCARfa1NTuiCihKpQMkGD24Gf/6zAGsikXzoHGuRdG2H5EunsCR2HX3jvm6 pRRgjaFlegY25ems+B/d17e8aGe8KQg1VBEzS0Er5Z6w+Q8Xg1GO9EwrScjtpyy2E9ZTJU iNoiT+bIU6s0QLF0JEjOk3MIjMzqbuzHqxNiNu18WQHh2e7hRVkPSI3Cgfz4LVXoh58i4C PrZz9uXUt0WKG8GSVZYy8Cd2kNAu83v7JjpPJq53HIYNWGhpRy8BN+Bo1WqFj/9Wdo/1i0 l68TB1XIf1cZXROWTJU1v+TPwga2ys/Gm2vftLSWyrsi7n91tUmjHUDshV5uTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689828983; 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=dl1TDHNWbrmB0evW3sXJX13kBGFtVaQm8NuZNuV+a2Q=; b=l7S660LhO91GO/R45fzgH+ECPbXaZIuexudBmsI6cfNcUEdjxe731HR4FAbFwmv4zsmHLR /5EhluVx4ZKGT59sEawmOiP+1skUyriGv/5iujpYqYuD445MJvga1AiTmhpfxWaUcRakw3 SGTJZx4nSuTaqWD5tOV7VjASh49Fkk3BovgeNpnNBP2ue7gpr2YyXGIVhTYpHbRG77HG1A QHLSBn+Ym/ZREMnWqQwQbWweFwP9E+WnNxbgIhG/ib23yjoNkaByXHFpOXGqLXrPuZa//B tZeWzNFmqp9I6gP5PRGC0T54KHLe5VuCe6cMBa+1XcMoX4BiRn9DoGprndBX2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689828983; a=rsa-sha256; cv=none; b=cGWp6VtUdBJzj7BHDdQZGtjvJmrtNH2by7BNrr1dBxs/9pLrb4LLttX8r5beGCzyUgTAVS MVCXw9yg2EMwD1Ra5d5RZBS7CgyQ5o357+K+ZIlHHEo0NkbT2RvjBtO2K1h1lFbO3BznEA 077kh7vYmYXaX70LPWSLNX4NEZBdauwsag1cP3l98PCZWAzUpZaIeViWa+vNi61X/YZoIi oEdA8SsQ9P0uscreT1SqV39yPhpISzWUWGEVk3YdleCm6LuhgDahiHS1SaxsubvMA1+fAu 9O19GfTPG6ov+uE4sHFJ24aumSBhukfvwOqFdhq080GcfTfrBj0NI/h7RXk+wA== 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 4R60lC14XqzHsr; Thu, 20 Jul 2023 04:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36K4uNWq059803; Thu, 20 Jul 2023 04:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36K4uNNN059802; Thu, 20 Jul 2023 04:56:23 GMT (envelope-from git) Date: Thu, 20 Jul 2023 04:56:23 GMT Message-Id: <202307200456.36K4uNNN059802@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: 9fc7fdd0f593 - main - www/gitlab-ce: fixed regression cause by upgrade of devel/rubygem-aws-sdk-core 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fc7fdd0f5939b0648dd58a6cc499f8744837d5e Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=9fc7fdd0f5939b0648dd58a6cc499f8744837d5e commit 9fc7fdd0f5939b0648dd58a6cc499f8744837d5e Author: Matthias Fechner AuthorDate: 2023-07-20 04:52:40 +0000 Commit: Matthias Fechner CommitDate: 2023-07-20 04:53:32 +0000 www/gitlab-ce: fixed regression cause by upgrade of devel/rubygem-aws-sdk-core --- www/gitlab-ce/Makefile | 6 +++--- www/gitlab-ce/distinfo | 6 +++--- www/gitlab-ce/files/patch-Gemfile | 11 ++++++++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 318c3a483081..e5f0e1ae2a75 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,5 +1,7 @@ PORTNAME= gitlab-ce PORTVERSION= 16.1.2 +DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -119,7 +121,7 @@ MY_DEPENDS= git>=2.39.2: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-core3175>=3.175.0<3.176:devel/rubygem-aws-sdk-core3175 \ + rubygem-aws-sdk-core>=3.175.0<4.176:devel/rubygem-aws-sdk-core \ rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \ rubygem-aws-sdk-s31126>=1.126.0<1.127:devel/rubygem-aws-sdk-s31126 \ rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \ @@ -291,8 +293,6 @@ USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss -# Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_TAGNAME= e60fc11f2d3d2a3d4fe6e1c9001e29091bd4ccd5 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 1055a59c6996..b46cc451a0c1 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688637835 -SHA256 (gitlab-org-gitlab-foss-e60fc11f2d3d2a3d4fe6e1c9001e29091bd4ccd5_GL0.tar.gz) = 67e7b5425a22b5f5cd9824fb0501e04b33afd409389e2448bd6669965f1871c4 -SIZE (gitlab-org-gitlab-foss-e60fc11f2d3d2a3d4fe6e1c9001e29091bd4ccd5_GL0.tar.gz) = 101886134 +TIMESTAMP = 1689569487 +SHA256 (gitlab-foss-v16.1.2.tar.bz2) = 6b8482a4a295470c3f100fc7c56ba71f4f324713a710e9d0cc9aa4da464464e9 +SIZE (gitlab-foss-v16.1.2.tar.bz2) = 89390241 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index da8b1cea2069..b236a717a939 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2023-06-21 08:07:20 UTC +--- Gemfile.orig 2023-07-04 20:45:49 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' +@@ -173,7 +173,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.175.0' ++gem 'aws-sdk-core', '~> 3.175' + gem 'aws-sdk-cloudformation', '~> 1' + gem 'aws-sdk-s3', '~> 1.126.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'