www/redmine60: upgrade to 6.0.4.

4 files changed, 17 insertions, 13 deletions

diff --git a/www/redmine60/Makefile b/www/redmine60/Makefile
index 75f0d28ac9cf..a3ea3a734dd3 100644
--- a/www/redmine60/Makefile
+++ b/www/redmine60/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	redmine
-PORTVERSION=	6.0.3
+PORTVERSION=	6.0.4
 CATEGORIES=	www
 MASTER_SITES=	https://www.redmine.org/releases/
 PKGNAMESUFFIX=	60
diff --git a/www/redmine60/distinfo b/www/redmine60/distinfo
index b395efd8e7f9..b09eaaa8aefe 100644
--- a/www/redmine60/distinfo
+++ b/www/redmine60/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738535177
-SHA256 (redmine-6.0.3.tar.gz) = 48a139e9416f97922ab48231912fed8aa4c48d4a96b8f507124b11e4335218d6
-SIZE (redmine-6.0.3.tar.gz) = 4057070
+TIMESTAMP = 1741671376
+SHA256 (redmine-6.0.4.tar.gz) = bebf8acb4fd1843f88e5f4285ff0b497fab43320c33e780a5c34e1124c5e177a
+SIZE (redmine-6.0.4.tar.gz) = 4058355
diff --git a/www/redmine60/files/patch-Gemfile b/www/redmine60/files/patch-Gemfile
index 526f3806153f..c454791e5f8f 100644
--- a/www/redmine60/files/patch-Gemfile
+++ b/www/redmine60/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2025-01-29 07:55:01 UTC
+--- Gemfile.orig	2025-03-10 23:30:05 UTC
 +++ Gemfile
 @@ -6,22 +6,22 @@ gem "actionpack-xml_parser"
  gem 'rouge', '~> 4.5'
@@ -8,8 +8,8 @@
 +gem 'roadie-rails', '>= 3.2.0'
  gem 'marcel'
  gem 'mail', '~> 2.8.1'
--gem 'nokogiri', '~> 1.16.0'
-+gem 'nokogiri', '>= 1.16'
+-gem 'nokogiri', '~> 1.18.3'
++gem 'nokogiri', '>= 1.18.3'
  gem 'i18n', '~> 1.14.1'
  gem 'rbpdf', '~> 1.21.3'
  gem 'addressable'
@@ -21,11 +21,12 @@
  #  Ruby Standard Gems
 -gem 'csv', '~> 3.2.8'
 -gem 'net-imap', '~> 0.4.8'
-+gem 'csv', '>= 3.3.0'
-+gem 'net-imap', '~> 0.5.0'
- gem 'net-pop', '~> 0.1.2'
+-gem 'net-pop', '~> 0.1.2'
 -gem 'net-smtp', '~> 0.4.0'
-+gem 'net-smtp', '~> 0.5.0'
++gem 'csv', '>= 3.2.8'
++gem 'net-imap', '>= 0.4.8'
++gem 'net-pop', '>= 0.1.2'
++gem 'net-smtp', '>= 0.4.0'
  
  # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
  gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
@@ -58,15 +59,16 @@
  end
  
  # Include database gems for the adapters found in the database
-@@ -110,9 +110,9 @@ group :test do
+@@ -110,10 +110,9 @@ group :test do
    gem "capybara", ">= 3.39"
    gem 'selenium-webdriver', '>= 4.11.0'
    # RuboCop
 -  gem 'rubocop', '~> 1.68.0', require: false
 -  gem 'rubocop-performance', '~> 1.22.0', require: false
 -  gem 'rubocop-rails', '~> 2.27.0', require: false
+-  gem 'bundle-audit', require: false
 +  gem 'rubocop', '>= 1.68.0', require: false
-+  gem 'rubocop-performance', '>= 1.23.0', require: false
++  gem 'rubocop-performance', '>= 1.22.0', require: false
 +  gem 'rubocop-rails', '>= 2.27.0', require: false
  end
  
diff --git a/www/redmine60/pkg-plist b/www/redmine60/pkg-plist
index 3cc6af16e21b..bfe04588a409 100644
--- a/www/redmine60/pkg-plist
+++ b/www/redmine60/pkg-plist
@@ -460,6 +460,7 @@
 %%WWWDIR%%/app/models/news.rb
 %%WWWDIR%%/app/models/principal.rb
 %%WWWDIR%%/app/models/project.rb
+%%WWWDIR%%/app/models/project_admin_query.rb
 %%WWWDIR%%/app/models/project_custom_field.rb
 %%WWWDIR%%/app/models/project_query.rb
 %%WWWDIR%%/app/models/query.rb
@@ -2113,6 +2114,7 @@
 %%WWWDIR%%/test/unit/message_test.rb
 %%WWWDIR%%/test/unit/news_test.rb
 %%WWWDIR%%/test/unit/principal_test.rb
+%%WWWDIR%%/test/unit/project_admin_query_test.rb
 %%WWWDIR%%/test/unit/project_copy_test.rb
 %%WWWDIR%%/test/unit/project_members_inheritance_test.rb
 %%WWWDIR%%/test/unit/project_nested_set_concurrency_test.rb