From nobody Fri Mar 22 07:35:25 2024 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 4V1Dd92xXBz5G0Pf; Fri, 22 Mar 2024 07:35:25 +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 4V1Dd92SWnz4MCB; Fri, 22 Mar 2024 07:35:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711092925; 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=qiJ5uvDa5yTskyWjckyzUjdb5si2KiLmAMn6usvgPUk=; b=Z/4zvqldKrjTV+M+sks4IshcLqwVC+j3Emu1O1r88bcZK9FrxRdv924IorVD8CKVaMtM64 6N+y5grWXxDph8wP+cOu4OEAwR80Qt6UAAPGqGjMBEdmvbqz30IRdOd4C3Lv/oAILckrDc 4NvwNrp4wwIxzpNBlnTHNH22NE9rv46dHgCL5A0nuqJ3T6lSa+gzeP97L7IJ0cJ8dpWu/R Lk8MJ4xhhLkvrxaxrHmNHKryW9LvFOri4vsaga0nN4Wz69AeZZ7hcB9BcBdy4/0jMhgGqN D968fZ2oeXDAyENAKpGjuyaOe034CCJ7dESE8SYTbCNYdjj2MrI4w9gwfIrEtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711092925; a=rsa-sha256; cv=none; b=g9JQNb0DbWcrVl/vM3dmCFyYUobG/MK1ZaHeGflmiBl2i25ulfrNQYL6RQAk2as94KjCmJ DILLB1Hdby/uegGohcYXiiV67TEQjQQX1M68+fXgh+8mEpJuvocCD1nPLE6VSl5O9BdB+V Nm5vgeYrGxVvgIHNljSeK0cOaXW+mf31nP5fP8CCW1G2LqFTspx11lKXusH0WGri1uLdAd L2N3qWLmI9jEDrG4jks8jOaJV42bu2SLRzeOCHg8kVm1m8zo8YOIn/j00meXMUrVLML07y ZEW0Cw8tiL0flUyJXEFPE3upTFdt+sUciHGPSLI6D6x25G/WVNs+aWmwpCqwfQ== 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=1711092925; 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=qiJ5uvDa5yTskyWjckyzUjdb5si2KiLmAMn6usvgPUk=; b=CJEWdP7zCSfy9GQrQM9Z1v8467VgEPVu/n4ppiGcw2vkFxYibEE9Co71YTN3JEIsQgQiNS dsYxmZ1ku6XeAWrj6TJz42nkf6t1vq4+2YAwl0jX15qVm1xv/EgwbWCLYvtqWHa20iwRXB AlSomTp8JMEp42WsqKwiIRg7Z8IpsgWhkayGB4nJUncqU91vjl0CNvEGQntJm2qbHNq1JM Qm4JARgbUca8SHmjzB5yMsxSpebr3ODV4A0ysMHdvUFhQrzbXSw8SuSTksz8NruhVcsZJy eDVbw6u2AQrfJN86bbD1nxSY5wSSkLphVEXncwjyBCfhvFLwHc/e97kkDqfw8Q== 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 4V1Dd923hfz18pW; Fri, 22 Mar 2024 07:35:25 +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 42M7ZPqh092748; Fri, 22 Mar 2024 07:35:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M7ZPCu092745; Fri, 22 Mar 2024 07:35:25 GMT (envelope-from git) Date: Fri, 22 Mar 2024 07:35:25 GMT Message-Id: <202403220735.42M7ZPCu092745@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: c0b038e0bb36 - main - www/redmine50: Fix build rubygem-roadie-rails-rails61 3.1.0 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: c0b038e0bb3669e1414267dd1cc052aa96bd7d05 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0b038e0bb3669e1414267dd1cc052aa96bd7d05 commit c0b038e0bb3669e1414267dd1cc052aa96bd7d05 Author: Mikael Urankar AuthorDate: 2024-03-22 07:30:43 +0000 Commit: Mikael Urankar CommitDate: 2024-03-22 07:35:03 +0000 www/redmine50: Fix build rubygem-roadie-rails-rails61 3.1.0 PR: 277866 --- www/redmine50/files/patch-Gemfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/www/redmine50/files/patch-Gemfile b/www/redmine50/files/patch-Gemfile index 0b6739f59ce8..8e84ab9212df 100644 --- a/www/redmine50/files/patch-Gemfile +++ b/www/redmine50/files/patch-Gemfile @@ -1,6 +1,6 @@ --- Gemfile.orig 2023-11-27 20:30:01 UTC +++ Gemfile -@@ -3,30 +3,30 @@ source 'https://rubygems.org' +@@ -3,30 +3,30 @@ gem 'bundler', '>= 1.12.0' ruby '>= 2.5.0', '< 3.2.0' gem 'bundler', '>= 1.12.0' @@ -12,7 +12,8 @@ gem 'request_store', '~> 1.5.0' gem 'mini_mime', '~> 1.1.0' gem "actionpack-xml_parser" - gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '~> 3.0.0') +-gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '~> 3.0.0') ++gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '>= 3.0.0') gem 'marcel' -gem "mail", "~> 2.7.1" +gem "mail", ">= 2.7.1" @@ -40,7 +41,7 @@ gem 'net-pop', '~> 0.1.1' # Rails 6.1.6.1 does not work with Pysch 3.0.2, which is installed by default with Ruby 2.5. See https://github.com/rails/rails/issues/45590 gem 'psych', '>= 3.1.0' if Gem.ruby_version < Gem::Version.new('2.6.0') -@@ -40,85 +40,10 @@ gem 'rqrcode' +@@ -40,85 +40,10 @@ group :ldap do # Optional gem for LDAP authentication group :ldap do @@ -127,7 +128,7 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exist?(local_gemfile) eval_gemfile local_gemfile -@@ -127,4 +52,8 @@ end +@@ -127,4 +52,8 @@ Dir.glob File.expand_path("../plugins/*/{Gemfile,Plugi # Load plugins' Gemfiles Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| eval_gemfile file