git: 3c6cd3e83538 - main - www/redmine4: Update to 4.1.6

The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3c6cd3e83538625b83935e18d3acffb2e335f112

commit 3c6cd3e83538625b83935e18d3acffb2e335f112
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2022-03-04 13:23:48 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2022-03-04 13:31:11 +0000

    www/redmine4: Update to 4.1.6
    
    Changes: https://www.redmine.org/projects/redmine/wiki/Changelog_4_1
---
 www/redmine4/Makefile            |  3 +--
 www/redmine4/distinfo            |  6 +++---
 www/redmine4/files/patch-Gemfile | 17 +++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/www/redmine4/Makefile b/www/redmine4/Makefile
index b9b8220738e8..63f0b66002f9 100644
--- a/www/redmine4/Makefile
+++ b/www/redmine4/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	redmine
-PORTVERSION=	4.1.5
-PORTREVISION=	1
+PORTVERSION=	4.1.6
 CATEGORIES=	www
 MASTER_SITES=	https://www.redmine.org/releases/
 PKGNAMESUFFIX=	4
diff --git a/www/redmine4/distinfo b/www/redmine4/distinfo
index 5524066f8c1a..ef3c24be5ba2 100644
--- a/www/redmine4/distinfo
+++ b/www/redmine4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633877816
-SHA256 (redmine-4.1.5.tar.gz) = 624dfeab7db5cda35a03d791b5fa83a836717ca280856c51cd089ed638f8678e
-SIZE (redmine-4.1.5.tar.gz) = 2722929
+TIMESTAMP = 1646389213
+SHA256 (redmine-4.1.6.tar.gz) = ad78999cb65ba2d1be344fdd582e4f24a9b97c88710ab217a954df437e04072f
+SIZE (redmine-4.1.6.tar.gz) = 2723049
diff --git a/www/redmine4/files/patch-Gemfile b/www/redmine4/files/patch-Gemfile
index bc935ec1a11a..4f2e3d9f2ced 100644
--- a/www/redmine4/files/patch-Gemfile
+++ b/www/redmine4/files/patch-Gemfile
@@ -1,14 +1,14 @@
 --- Gemfile.orig	2021-04-22 10:46:10 UTC
 +++ Gemfile
-@@ -1,21 +1,21 @@
+@@ -1,21 +1,21 @@ source 'https://rubygems.org'
  source 'https://rubygems.org'
  
 -ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0'
 +ruby '>= 2.3.0', '< 2.8.0' if Bundler::VERSION >= '1.12.0'
  gem "bundler", ">= 1.5.0"
  
--gem 'rails', '5.2.6'
-+gem 'rails', '~> 5.2.5'
+-gem 'rails', '5.2.6.2'
++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.12.0"
@@ -28,16 +28,16 @@
  gem "rbpdf", "~> 1.20.0"
  
  # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-@@ -22,7 +22,7 @@ gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :ms
+@@ -23,7 +23,7 @@ group :ldap do
  
  # Optional gem for LDAP authentication
  group :ldap do
 -  gem "net-ldap", "~> 0.16.0"
-+  gem "net-ldap", "~> 0.17.0"
++  gem "net-ldap", ">= 0.17.0"
  end
  
  # Optional gem for OpenID authentication
-@@ -31,66 +31,6 @@ group :openid do
+@@ -32,67 +32,6 @@ end
    gem "rack-openid"
  end
  
@@ -57,7 +57,8 @@
 -require 'yaml'
 -database_file = File.join(File.dirname(__FILE__), "config/database.yml")
 -if File.exist?(database_file)
--  database_config = YAML::load(ERB.new(IO.read(database_file)).result)
+-  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.map {|c| c['adapter']}.compact.uniq
 -  if adapters.any?
 -    adapters.each do |adapter|
@@ -104,7 +105,7 @@
  local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
  if File.exists?(local_gemfile)
    eval_gemfile local_gemfile
-@@ -99,4 +39,8 @@ end
+@@ -101,4 +40,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