Pullup ticket #6689 - requested by taca

devel/ruby-redmine42: security fix

Revisions pulled up:
- devel/ruby-redmine42/Makefile                                 1.15
- devel/ruby-redmine42/PLIST                                    1.4
- devel/ruby-redmine42/distinfo                                 1.11
- devel/ruby-redmine42/patches/patch-Gemfile                    1.7

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Oct  9 15:31:47 UTC 2022

   Modified Files:
   	pkgsrc/devel/ruby-redmine42: Makefile PLIST distinfo
   	pkgsrc/devel/ruby-redmine42/patches: patch-Gemfile

   Log Message:
   devel/ruby-redmine42: update to 4.2.8

   4.2.8 (2022-10-02)

   [Code cleanup/refactoring]¶

   * Defect #37449: Passing a wrong parameter to `with_settings` in
     UserTest::test_random_password_include_required_characters

   [Filters]

   * Defect #36940: Chained custom field filter doesn't work for User fields

   * Defect #37349: Chained custom field filter for User fields returns 500
     internal server error when filtering after a float value

   [Issues]

   * Defect #37473: Focus IssueId not working when linking issues

   [Issues list]

   * Defect #37268: Performance problem with Redmine 4.2.7 and 5.0.2

   [Rails support]

   * Patch #37465: Update Rails to 5.2.8.1

   [Security]

   * Defect #37492: Update jQuery UI to 1.13.2

   [SCM]

   * Defect #37718: Repository browser does not show "+" (plus sign) in
     filename

   [Text formatting]

   * Defect #37379: Thumbnail macro does not work when a file is attached and
     preview is displayed immediately

   [Translations]

   * Patch #37698: Persian translation update for 4.2-stable

   [UI]

   * Defect #36901: Jump to project is misaligned in Safari 15.4 and later
   * Defect #37282: Subtask isn't displayed correctly since 4.2.7
   * Defect #37481: Fix the unintentional selection of rows with the context
     menu
   * Defect #37566: The number of the ordered list in the project description
     is not displayed and the indentation does not match the unordered list

4 files changed, 29 insertions, 21 deletions

diff --git a/devel/ruby-redmine42/Makefile b/devel/ruby-redmine42/Makefile
index 7bcff257b51..e2583fadfce 100644
--- a/devel/ruby-redmine42/Makefile
+++ b/devel/ruby-redmine42/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2022/09/05 15:43:29 taca Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2022/10/22 10:22:10 bsiegert Exp $
 
 DISTNAME=	redmine-${RM_VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/redmine/redmine${RM_VER}/}
-PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.redmine.org/releases/
 
@@ -13,7 +12,7 @@ LICENSE=	gnu-gpl-v2 # and so on.
 
 USE_TOOLS+=	pax
 
-RM_VERSION=	4.2.7
+RM_VERSION=	4.2.8
 
 NO_BUILD=	yes
 
@@ -21,8 +20,7 @@ RUBY_VERSIONS_ACCEPTED=	26 27
 
 RUBY_RAILS_ACCEPTED=	52
 
-OVERRIDE_GEMSPEC+=	csv>=3.1.1 i18n>=1.8.2 nokogiri>=1.11.0 \
-			mini_mime>=1.0.1
+OVERRIDE_GEMSPEC+=	csv>=3.1.1 i18n>=1.8.2 mini_mime>=1.0.1
 
 REPLACE_RUBY+=	bin/*
 REPLACE_RUBY+=	extra/mail_handler/rdm-mailhandler.rb
@@ -36,13 +34,13 @@ DEPENDS+=	${RUBY_RAILS_DEPENDS}
 DEPENDS+=	${RUBY_PKGPREFIX}-rouge>=3.26:../../www/ruby-rouge
 DEPENDS+=	${RUBY_PKGPREFIX}-request_store>=1.5.0<1.6:../../www/ruby-request_store
 # ruby-mail depends it.
-#DEPENDS+=	${RUBY_PKGPREFIX}-mini_mime>=1.0.1<1.1:../../mail/ruby-mini_mime
+#DEPENDS+=	${RUBY_PKGPREFIX}-mini_mime>=1.0.1:../../mail/ruby-mini_mime
 DEPENDS+=	${RUBY_PKGPREFIX}-actionpack52-xml_parser>=2.0:../../textproc/ruby-actionpack52-xml_parser
 DEPENDS+=	${RUBY_PKGPREFIX}-roadie-rails2_${RUBY_RAILS}>=2.2.0<2.3:../../mail/ruby-roadie-rails2
 DEPENDS+=	${RUBY_PKGPREFIX}-marcel>=1.0.0:../../devel/ruby-marcel
 DEPENDS+=	${RUBY_PKGPREFIX}-mail>=2.7.1<2.8:../../mail/ruby-mail
 DEPENDS+=	${RUBY_PKGPREFIX}-csv>=3.1.1:../../textproc/ruby-csv
-DEPENDS+=	${RUBY_PKGPREFIX}-nokogiri>=1.11.1:../../textproc/ruby-nokogiri
+DEPENDS+=	${RUBY_PKGPREFIX}-nokogiri>=1.13.6:../../textproc/ruby-nokogiri
 DEPENDS+=	${RUBY_PKGPREFIX}-i18n>=1.8.2<2:../../devel/ruby-i18n
 DEPENDS+=	${RUBY_PKGPREFIX}-rbpdf>=1.20.0<1.21:../../print/ruby-rbpdf
 DEPENDS+=	${RUBY_PKGPREFIX}-addressable>=0:../../net/ruby-addressable
diff --git a/devel/ruby-redmine42/PLIST b/devel/ruby-redmine42/PLIST
index b0a23f6e6ce..28cf15d29cf 100644
--- a/devel/ruby-redmine42/PLIST
+++ b/devel/ruby-redmine42/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2022/06/22 15:39:58 taca Exp $
+@comment $NetBSD: PLIST,v 1.3.4.1 2022/10/22 10:22:10 bsiegert Exp $
 bin/redmine42_generate_secret_token${RUBY_SUFFIX}.sh
 bin/redmine42_load_default_data${RUBY_SUFFIX}.sh
 bin/redmine42_migrate_db${RUBY_SUFFIX}.sh
@@ -1613,7 +1613,7 @@ share/${RUBY_NAME}-redmine42/public/javascripts/i18n/datepicker-uk.js
 share/${RUBY_NAME}-redmine42/public/javascripts/i18n/datepicker-vi.js
 share/${RUBY_NAME}-redmine42/public/javascripts/i18n/datepicker-zh-CN.js
 share/${RUBY_NAME}-redmine42/public/javascripts/i18n/datepicker-zh-TW.js
-share/${RUBY_NAME}-redmine42/public/javascripts/jquery-3.6.0-ui-1.13.1-ujs-5.2.4.5.js
+share/${RUBY_NAME}-redmine42/public/javascripts/jquery-3.6.1-ui-1.13.2-ujs-5.2.8.1.js
 share/${RUBY_NAME}-redmine42/public/javascripts/jquery-migrate-3.3.2.min.js
 share/${RUBY_NAME}-redmine42/public/javascripts/jstoolbar/jstoolbar.js
 share/${RUBY_NAME}-redmine42/public/javascripts/jstoolbar/lang/jstoolbar-ar.js
@@ -1685,7 +1685,7 @@ share/${RUBY_NAME}-redmine42/public/stylesheets/jquery/images/ui-icons_777620_25
 share/${RUBY_NAME}-redmine42/public/stylesheets/jquery/images/ui-icons_777777_256x240.png
 share/${RUBY_NAME}-redmine42/public/stylesheets/jquery/images/ui-icons_cc0000_256x240.png
 share/${RUBY_NAME}-redmine42/public/stylesheets/jquery/images/ui-icons_ffffff_256x240.png
-share/${RUBY_NAME}-redmine42/public/stylesheets/jquery/jquery-ui-1.13.1.css
+share/${RUBY_NAME}-redmine42/public/stylesheets/jquery/jquery-ui-1.13.2.css
 share/${RUBY_NAME}-redmine42/public/stylesheets/jstoolbar.css
 share/${RUBY_NAME}-redmine42/public/stylesheets/responsive.css
 share/${RUBY_NAME}-redmine42/public/stylesheets/rtl.css
diff --git a/devel/ruby-redmine42/distinfo b/devel/ruby-redmine42/distinfo
index 90bed3696a6..25bb12c3b45 100644
--- a/devel/ruby-redmine42/distinfo
+++ b/devel/ruby-redmine42/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2022/06/22 15:39:58 taca Exp $
+$NetBSD: distinfo,v 1.10.4.1 2022/10/22 10:22:10 bsiegert Exp $
 
-BLAKE2s (redmine-4.2.7.tar.gz) = 3e692c8190c896d0f40deb94a709494448622d68a03531323effdc015af0d8ad
-SHA512 (redmine-4.2.7.tar.gz) = 6654aec3981de8b26de416d253c22c91d881dd7df54192ce41e6e99213c6f4b0947ce213fe484c18117f8701d0528ebb23fe3acf335f84638eeddd972b601be9
-Size (redmine-4.2.7.tar.gz) = 3042676 bytes
-SHA1 (patch-Gemfile) = 45289d38e0209c7393c199e5e915afca8f25fb7b
+BLAKE2s (redmine-4.2.8.tar.gz) = 680e3838dc1c094b38e053edac9099c015bae2ed77ebb9d8cc439722eff63b8e
+SHA512 (redmine-4.2.8.tar.gz) = 0cb2d1d8d700503855ac626a056413035cd14d46b6fca0a312461ab112c990b2eaeaa4212c3be5738df8c145160ac4ae0dfb1c2d21586e953452d09b782cc748
+Size (redmine-4.2.8.tar.gz) = 3043322 bytes
+SHA1 (patch-Gemfile) = 5b3dcc200f2e62ebec6e1ad0be4217ac06229869
 SHA1 (patch-lib_tasks_initializers.rake) = 73c4594c94abd28e628bbd172565b161f0e54fff
diff --git a/devel/ruby-redmine42/patches/patch-Gemfile b/devel/ruby-redmine42/patches/patch-Gemfile
index c2c79f08893..18e7af98f76 100644
--- a/devel/ruby-redmine42/patches/patch-Gemfile
+++ b/devel/ruby-redmine42/patches/patch-Gemfile
@@ -1,21 +1,22 @@
-$NetBSD: patch-Gemfile,v 1.6 2022/06/15 14:22:55 taca Exp $
+$NetBSD: patch-Gemfile,v 1.6.4.1 2022/10/22 10:22:10 bsiegert Exp $
 
 Relax dependency.
 
---- Gemfile.orig	2022-05-16 22:10:08.000000000 +0000
+--- Gemfile.orig	2022-10-02 20:10:08.000000000 +0000
 +++ Gemfile
 @@ -3,17 +3,17 @@ source 'https://rubygems.org'
  ruby '>= 2.4.0', '< 2.8.0'
  gem 'bundler', '>= 1.12.0'
  
--gem 'rails', '5.2.8'
+-gem 'rails', '5.2.8.1'
 +gem 'rails', '~> 5.2.8'
  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 'request_store', '~> 1.5.0'
- gem "mini_mime", "~> 1.0.1"
+-gem "mini_mime", "~> 1.0.1"
++gem "mini_mime", ">= 1.0.1"
  gem "actionpack-xml_parser"
  gem 'roadie-rails', (RUBY_VERSION < '2.5' ? '~> 1.3.0' : '~> 2.2.0')
  gem 'marcel'
@@ -25,7 +26,16 @@ Relax dependency.
  gem 'nokogiri', (if Gem.ruby_version < Gem::Version.new('2.5.0')
                     '~> 1.10.10'
                   elsif Gem.ruby_version < Gem::Version.new('2.6.0')
-@@ -69,7 +69,7 @@ if File.exist?(database_file)
+@@ -21,7 +21,7 @@ gem 'nokogiri', (if Gem.ruby_version < G
+                  else
+                    '~> 1.13.6'
+                  end)
+-gem 'i18n', '~> 1.8.2'
++gem 'i18n', '~> 1.8'
+ gem "rbpdf", "~> 1.20.0"
+ gem 'addressable'
+ gem 'rubyzip', '~> 2.3.0'
+@@ -70,7 +70,7 @@ if File.exist?(database_file)
        when 'mysql2'
          gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]
        when /postgresql/
@@ -34,7 +44,7 @@ Relax dependency.
        when /sqlite3/
          gem "sqlite3", "~> 1.4.0", :platforms => [:mri, :mingw, :x64_mingw]
        when /sqlserver/
-@@ -86,26 +86,6 @@ else
+@@ -87,26 +87,6 @@ else
    warn("Please configure your config/database.yml first")
  end