From nobody Wed Jan 19 07:32:09 2022 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 6621A19607B1; Wed, 19 Jan 2022 07:32:12 +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 4Jdy5P5npYz3wKr; Wed, 19 Jan 2022 07:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642577531; 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=aCqaL5hEl7sNc8vK9BVS/DhciR8Fl6iabe9h9DIh/lQ=; b=O+cssUkAw87o987F2oKeM88zZ4M17DH0JhFaxn3MHAsTv3zCtHdjibHa6xoOIQL+SHhaxl Y2fP7RTrPOFA2+sg6hAr1dgHUhzj41Lvis9TWkMY6qy6nT1kWHYHdDwdibIKiy2r0mpjj7 N44KG2NrG4dVRVY2AnAvKIag1cBLc/HxO5+9bvfY7SJQPu3s7KdO5LWEP4p9yhKZD31aAn /9wqLEc6Ny6LhYK2Azhj8kanV+obCbh1gol4EMFOkIReG49nlRvc6Eu+sYPi9FJzcx2D09 grLcd1jHBVmt6iXjUi30sZI/WrsMiOr/IQqDcV8bKsXxnCqb7AgfsLkilrgSkQ== 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 4E043111A0; Wed, 19 Jan 2022 07:32:09 +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 20J7W9Pv061387; Wed, 19 Jan 2022 07:32:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20J7W9Aq061386; Wed, 19 Jan 2022 07:32:09 GMT (envelope-from git) Date: Wed, 19 Jan 2022 07:32:09 GMT Message-Id: <202201190732.20J7W9Aq061386@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: ff28792483a1 - main - www/redmine42: Fix build after recent rubygem update. 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff28792483a154909271580a22460379693b341f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642577531; 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=aCqaL5hEl7sNc8vK9BVS/DhciR8Fl6iabe9h9DIh/lQ=; b=VyTw5YZosF71n2MR/LeBnZzospCOATMoPZXur2vsmaq2hSmsSwOBJorw+s31wFg1Seeonq ydZHP6xesqNDkL3GQb+K/XznP1l4DJhBwl5cXWFUL/kpZqka2oFYVYpMZ7Bzz1hC1MsQK7 q+iH3GN3kVJq0bYnzCOYqa2gLrAML163KuLJaTn2gFOzD8bbzLHvCwLwiqx6jtM1ts5c0Y k4L4cTd8QW3GgGWLqy5AliDx7KKa4tcFQJWpD7gDZhjPE8NBSz89P2qUc16ZQOidSrUO2O pQbJSm85v57RI7tjP27CsayT8JdT3Mk6ksyZPu7SqCYdyZkMEJhaK/L/qaq61A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642577531; a=rsa-sha256; cv=none; b=Z20f10kuaxhhRBZ2c4ivrYd24QH3MOu9YTwXk0bfBhMkiEjPfpCPp1SI6Hifx9dhifuPpb CxgR1TGfe6RRRB/Qij8dgpErbYTVpnC6Ovso8ODzWLoFk3YO4HIao2nhZL1lXkcruWPAzq jRMM5OvqpCYWpzfvfSnfdXdm0I7ZetQ1/HK9+WqOKgUYPShl0AHbFVlWYYOEl3mT5k6ODh y/7Icc5rYDGOLwJlMwHXUbR4Ik9Vj+FeiogMx5sLXIH6GUXlVlHi/1GycLxVXsOvdYx9Kl 1e1CLAbw9+Uqqgz0LDlOOTSvx2orSYfLhB9iV+bhu9uylMR0S7ARST+x7qlfxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff28792483a154909271580a22460379693b341f commit ff28792483a154909271580a22460379693b341f Author: Mikael Urankar AuthorDate: 2022-01-18 20:03:50 +0000 Commit: Mikael Urankar CommitDate: 2022-01-19 07:31:56 +0000 www/redmine42: Fix build after recent rubygem update. --- www/redmine42/files/patch-Gemfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/www/redmine42/files/patch-Gemfile b/www/redmine42/files/patch-Gemfile index 3418d479f5e7..7fccf134febe 100644 --- a/www/redmine42/files/patch-Gemfile +++ b/www/redmine42/files/patch-Gemfile @@ -1,8 +1,11 @@ --- Gemfile.orig 2021-04-30 11:34:49 UTC +++ Gemfile -@@ -8,12 +8,12 @@ gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' +@@ -6,14 +6,14 @@ gem 'bundler', '>= 1.12.0' + gem 'rails', '5.2.6' + gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') - gem 'rouge', '~> 3.26.0' +-gem 'rouge', '~> 3.26.0' ++gem 'rouge', '>= 3.26.0' gem 'request_store', '~> 1.5.0' -gem "mini_mime", "~> 1.0.1" +gem "mini_mime", ">= 1.0.1" @@ -15,7 +18,7 @@ gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1') gem 'i18n', '~> 1.8.2' gem "rbpdf", "~> 1.20.0" -@@ -37,67 +37,6 @@ group :openid do +@@ -38,67 +38,6 @@ group :openid do gem "rack-openid" end @@ -83,7 +86,7 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exists?(local_gemfile) eval_gemfile local_gemfile -@@ -106,4 +45,8 @@ end +@@ -107,4 +46,8 @@ end # Load plugins' Gemfiles Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| eval_gemfile file