From nobody Sun Jan 01 07:09:46 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 4Nl99Q63plz2nvjR; Sun, 1 Jan 2023 07:09:46 +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 4Nl99Q5drtz3kNr; Sun, 1 Jan 2023 07:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672556986; 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=/0i/xNSUH2+ggNHGKwLqzrKirW9nlg+fvMntIgWORwg=; b=ehnplRmbn+P2oj1XNsGbAsV8h2UFG8oeo4FlBSgqwg5k8WtLXOWZc1sxpiLaASII4q2if6 nemkWqGDqo8qFmy/YhusEyEKTpbhj35G0oS8lYlLQBU3CTN91Ta2N5BL6AUAfm38iYMHBw howh7JC4rEQrlV9fdyg0tKjcskdPVVK/9YC/Glb8RTM34HLAaA/SdaWPmZ3qkou2N4mhgi 2tvxLaOkl8H56nrogOx8p4s+gL4zHQ7Eb/+qyTwPSXUqMZwLHGCzgCBErQicV4irCpIBK7 s5tzv87utdZJkD0i7bINAFIhbaiTAcpXlR1uoWVV2/Vehdie3dlIQxbchqdX/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672556986; 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=/0i/xNSUH2+ggNHGKwLqzrKirW9nlg+fvMntIgWORwg=; b=LwRQFWCLfyNZZ6C+uT3kXhoZYZJa1ikX9VgeXJ9AtRMAfSHDGGXXYU2V0bfTV08Gm8fa6T FGpaNRblfsF9CCFzXY9PDxqxB0WeYovnWbxdXXhz81k8Mb+7LTXqwlgBVFGBIURKpw3rXg lHiw18T67ApdWGJVoSOLYHNmjuZ+QWTpXeF61II0PLh1BYOXlP9zDr2Bv0xQliSx7JYiAk KNwrZv95+OQSBscIQI65waUoBxQlOOPUrCIStwFr7us2Gzjbd5+yzEIZeACMf/6pmDlKrX iexrGEfRwH+tsb1w0+cJvOYG2ZcKPFNFZgmuy6j4MEABoNuZuDCqxdJ/fIAvnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672556986; a=rsa-sha256; cv=none; b=OiZ84fUtEak00OwpYwhL3bHajdb8EDi81An8Ha94uV0j0F4x6pxhv0sOyCGSFahhS9IOCh +iZ9dyma+RRMKubeWRFhy8wTfgQzWvnR480b6kHYrPHyPxLIFvXuWTk7nxB3QdQAp3zgip BcjKqRurCyQMYlCXf2x9A4/QmKpCPFWqDY0lVVBj5/x9FTnEvrWP7O0z7aFp80/RZ+ZWyr sc5EyKO9gOKexxYGQhJazN6PJ+nAlLA8y5MZbrvtxseCUwaI/Qtoj3EBUdr+3cIuvvrEHd vvJAU/jhiT5ZkChkEwCQbFjBW1qXGCXvNQfmRl3bIdykpcJYl6YLdaD4hCvsgg== 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 4Nl99Q4lYSzJqg; Sun, 1 Jan 2023 07:09:46 +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 30179krI072281; Sun, 1 Jan 2023 07:09:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30179kgC072280; Sun, 1 Jan 2023 07:09:46 GMT (envelope-from git) Date: Sun, 1 Jan 2023 07:09:46 GMT Message-Id: <202301010709.30179kgC072280@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: 87a1ca93449a - main - www/gitlab-ce: Unbreak build 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: 87a1ca93449a1b28c231161082b9402e10844a67 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=87a1ca93449a1b28c231161082b9402e10844a67 commit 87a1ca93449a1b28c231161082b9402e10844a67 Author: Matthias Fechner AuthorDate: 2023-01-01 06:29:05 +0000 Commit: Matthias Fechner CommitDate: 2023-01-01 07:09:36 +0000 www/gitlab-ce: Unbreak build Break was introduced by aaa945714f7184e527915c4fce6ab37f33e0ac39 --- www/gitlab-ce/Makefile | 4 ++-- www/gitlab-ce/files/patch-Gemfile | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 79851f69a313..b722a1f087ae 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 15.5.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -27,7 +27,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ gtar>0:archivers/gtar \ bash>0:shells/bash \ rubygem-rails61>=6.1.6.1<6.1.8:www/rubygem-rails61 \ - rubygem-bootsnap112>=1.12.0<1.13:devel/rubygem-bootsnap112 \ + rubygem-bootsnap>=1.13.0<1.15:devel/rubygem-bootsnap \ rubygem-openssl221>=2.2.1<2.2.2:security/rubygem-openssl221 \ rubygem-ipaddr122>=1.2.2<1.2.3:net/rubygem-ipaddr122 \ rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \ diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 95199f7b202c..85b35e8e80a5 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,14 +1,17 @@ --- Gemfile.orig 2022-12-07 19:22:40 UTC +++ Gemfile -@@ -13,7 +13,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems +@@ -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 # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 -gem 'rails', '~> 6.1.6.1' +gem 'rails', '~> 6.1.6' - gem 'bootsnap', '~> 1.13.0', require: false +-gem 'bootsnap', '~> 1.13.0', require: false ++gem 'bootsnap', '~> 1.14.0', require: false + # Pin openssl to match the version bundled with our supported Rubies. + # See https://stdgems.org/openssl/#gem-version. @@ -57,18 +57,18 @@ gem 'doorkeeper-openid_connect', '~> 1.7.5' gem 'rexml', '~> 3.2.5' gem 'ruby-saml', '~> 1.13.0'