Date: Sun, 15 Dec 2024 08:44:47 GMT From: Xin LI <delphij@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: de817d09bfc5 - main - www/redmine51: upgrade to 5.1.5 Message-ID: <202412150844.4BF8ilCE095462@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=de817d09bfc53ea4cd3071cd8b10baff288772fd commit de817d09bfc53ea4cd3071cd8b10baff288772fd Author: Xin LI <delphij@FreeBSD.org> AuthorDate: 2024-12-14 23:02:34 +0000 Commit: Xin LI <delphij@FreeBSD.org> CommitDate: 2024-12-15 08:44:36 +0000 www/redmine51: upgrade to 5.1.5 --- www/redmine51/Makefile | 2 +- www/redmine51/distinfo | 6 +++--- www/redmine51/files/patch-Gemfile | 25 ++++++++++++++++--------- www/redmine51/pkg-plist | 1 + 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/www/redmine51/Makefile b/www/redmine51/Makefile index 2e7a21ebc9d8..0572633c9a2a 100644 --- a/www/redmine51/Makefile +++ b/www/redmine51/Makefile @@ -1,5 +1,5 @@ PORTNAME= redmine -PORTVERSION= 5.1.4 +PORTVERSION= 5.1.5 CATEGORIES= www MASTER_SITES= https://www.redmine.org/releases/ PKGNAMESUFFIX= 51 diff --git a/www/redmine51/distinfo b/www/redmine51/distinfo index 7e5bfeeb8b5f..c25ca60764a7 100644 --- a/www/redmine51/distinfo +++ b/www/redmine51/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731143000 -SHA256 (redmine-5.1.4.tar.gz) = f5738d6a107f231b8f4b0ae5410e0c45742d75e0ef30c4b31a27c0ac9dafd51c -SIZE (redmine-5.1.4.tar.gz) = 3256191 +TIMESTAMP = 1734211981 +SHA256 (redmine-5.1.5.tar.gz) = 2c9739511712fc1381d9584fa005f911a3022e8366d1d6a53fec0f014dac0168 +SIZE (redmine-5.1.5.tar.gz) = 3257204 diff --git a/www/redmine51/files/patch-Gemfile b/www/redmine51/files/patch-Gemfile index aa3f6198db48..f703349ad123 100644 --- a/www/redmine51/files/patch-Gemfile +++ b/www/redmine51/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2024-11-03 22:15:03 UTC +--- Gemfile.orig 2024-12-11 18:25:01 UTC +++ Gemfile @@ -2,25 +2,25 @@ ruby '>= 2.7.0', '< 3.3.0' @@ -33,7 +33,7 @@ gem 'rexml', require: false if Gem.ruby_version >= Gem::Version.new('3.0') # Windows does not include zoneinfo files, so bundle the tzinfo-data gem -@@ -31,88 +31,14 @@ gem 'rqrcode' +@@ -31,95 +31,14 @@ gem 'rqrcode' gem 'rqrcode' # HTML pipeline and sanitization @@ -65,16 +65,23 @@ - -# Include database gems for the adapters found in the database -# configuration file --require 'erb' --require 'yaml' -database_file = File.join(File.dirname(__FILE__), "config/database.yml") -if File.exist?(database_file) -- yaml_config = ERB.new(IO.read(database_file)).result -- database_config = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(yaml_config) : YAML.load(yaml_config) -- adapters = database_config.values.filter_map {|c| c['adapter']}.uniq +- database_config = File.read(database_file) +- +- # Requiring libraries in a Gemfile may cause Bundler warnings or +- # unexpected behavior, especially if multiple gem versions are available. +- # So, process database.yml through ERB only if it contains ERB syntax +- # in the adapter setting. See https://www.redmine.org/issues/41749. +- if database_config.match?(/^ *adapter: *<%=/) +- require 'erb' +- database_config = ERB.new(database_config).result +- end +- +- adapters = database_config.scan(/^ *adapter: *(.*)/).flatten.uniq - if adapters.any? - adapters.each do |adapter| -- case adapter +- case adapter.strip - when 'mysql2' - gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] - gem "with_advisory_lock" @@ -124,7 +131,7 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exist?(local_gemfile) eval_gemfile local_gemfile -@@ -121,4 +47,8 @@ Dir.glob File.expand_path("../plugins/*/{Gemfile,Plugi +@@ -128,4 +47,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 diff --git a/www/redmine51/pkg-plist b/www/redmine51/pkg-plist index a49d076ac740..5ee171338a84 100644 --- a/www/redmine51/pkg-plist +++ b/www/redmine51/pkg-plist @@ -2097,6 +2097,7 @@ %%WWWDIR%%/test/system/quick_jump_test.rb %%WWWDIR%%/test/system/sudo_mode_test.rb %%WWWDIR%%/test/system/timelog_test.rb +%%WWWDIR%%/test/system/versions_test.rb %%WWWDIR%%/test/test_helper.rb %%WWWDIR%%/test/unit/activity_test.rb %%WWWDIR%%/test/unit/attachment_test.rb
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412150844.4BF8ilCE095462>