[pkgsrc/trunk]: pkgsrc/devel/ruby-redmine42 devel/ruby-redmine42: update to 4...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7979007b3646
branches:  trunk
changeset: 380799:7979007b3646
user:      taca <taca%pkgsrc.org@localhost>
date:      Wed Jun 15 14:22:55 2022 +0000

description:
devel/ruby-redmine42: update to 4.2.6

pkgsrc change: relax dependency to ruby-i18n package.


>From release announce on 2022-05-16.

Redmine 4.2.6 and 5.0.1 have been released and are available for download,
you can review the changes in the Changelog.

These maintenance releases address some important issues that were found in
the latest Redmine 4.2.5 and 5.0.0 releases.

Security: these releases include two security fixes:

* an update to the latest Ruby on Rails 5.2.8 for 4.2.6 and Rails 6.1.6 for
  5.0.1 that fixes CVE-2022-22577 and CVS-2022-27777.

* an update to nokogiri gem that fixes another 2 CVEs: CVE-2021-41098 and
  CVE-2021-30560

Thanks to A Fora for reporting the nokogiri security issues and all the
contributors who worked on these releases!

diffstat:

 devel/ruby-redmine42/Makefile              |   9 +++++----
 devel/ruby-redmine42/distinfo              |  10 +++++-----
 devel/ruby-redmine42/patches/patch-Gemfile |  18 +++++++++---------
 3 files changed, 19 insertions(+), 18 deletions(-)

diffs (100 lines):

diff -r 8913b13aa52c -r 7979007b3646 devel/ruby-redmine42/Makefile
--- a/devel/ruby-redmine42/Makefile     Wed Jun 15 14:14:29 2022 +0000
+++ b/devel/ruby-redmine42/Makefile     Wed Jun 15 14:22:55 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/05/04 17:34:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2022/06/15 14:22:55 taca Exp $
 
 DISTNAME=      redmine-${RM_VERSION}
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/redmine/redmine${RM_VER}/}
@@ -12,7 +12,7 @@
 
 USE_TOOLS+=    pax
 
-RM_VERSION=    4.2.5
+RM_VERSION=    4.2.6
 
 NO_BUILD=      yes
 
@@ -20,7 +20,8 @@
 
 RUBY_RAILS_ACCEPTED=   52
 
-OVERRIDE_GEMSPEC+=     nokogiri>=1.11.0 mini_mime>=1.0.1 csv>=3.1.1
+OVERRIDE_GEMSPEC+=     csv>=3.1.1 i18n>=1.8.2 nokogiri>=1.11.0 \
+                       mini_mime>=1.0.1
 
 REPLACE_RUBY+= bin/*
 REPLACE_RUBY+= extra/mail_handler/rdm-mailhandler.rb
@@ -41,7 +42,7 @@
 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}-i18n>=1.8.2<1.9:../../devel/ruby-i18n
+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
 DEPENDS+=      ${RUBY_PKGPREFIX}-zip>=2.3.0<2.4:../../archivers/ruby-zip
diff -r 8913b13aa52c -r 7979007b3646 devel/ruby-redmine42/distinfo
--- a/devel/ruby-redmine42/distinfo     Wed Jun 15 14:14:29 2022 +0000
+++ b/devel/ruby-redmine42/distinfo     Wed Jun 15 14:22:55 2022 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2022/04/03 05:36:02 taca Exp $
+$NetBSD: distinfo,v 1.9 2022/06/15 14:22:55 taca Exp $
 
-BLAKE2s (redmine-4.2.5.tar.gz) = 1be445cfe22d3d5bc656339a283e10db40037123f60daf7d30472204d645d863
-SHA512 (redmine-4.2.5.tar.gz) = d831396eec5fd67a4e214bb476de916cbb7d03a6925b1144f12c2cbd8dfa51013cc68b6740fe5d5c26018adaac510bbe3a3f8d692bac2ffc86177c27be71f5cc
-Size (redmine-4.2.5.tar.gz) = 3041844 bytes
-SHA1 (patch-Gemfile) = f986889cdf794c7cf2a542e5a0d91a8f2ff676c6
+BLAKE2s (redmine-4.2.6.tar.gz) = 3e87ec7b1a4568d0d46cc8868d3ecd8481687411fce813eb50e50f5e0a7058de
+SHA512 (redmine-4.2.6.tar.gz) = 4071783917627927c0239cd3fefbc04a48706c28cd63b7fb09b5d234698b5847cc66f27dd717ee8d144385174471361b73b781799f02b73a49e141a6cbdd4077
+Size (redmine-4.2.6.tar.gz) = 3041632 bytes
+SHA1 (patch-Gemfile) = 45289d38e0209c7393c199e5e915afca8f25fb7b
 SHA1 (patch-lib_tasks_initializers.rake) = 73c4594c94abd28e628bbd172565b161f0e54fff
diff -r 8913b13aa52c -r 7979007b3646 devel/ruby-redmine42/patches/patch-Gemfile
--- a/devel/ruby-redmine42/patches/patch-Gemfile        Wed Jun 15 14:14:29 2022 +0000
+++ b/devel/ruby-redmine42/patches/patch-Gemfile        Wed Jun 15 14:22:55 2022 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-Gemfile,v 1.5 2022/04/03 05:36:02 taca Exp $
+$NetBSD: patch-Gemfile,v 1.6 2022/06/15 14:22:55 taca Exp $
 
 Relax dependency.
 
---- Gemfile.orig       2022-03-28 19:50:40.000000000 +0000
+--- Gemfile.orig       2022-05-16 22: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.6.3'
-+gem 'rails', '~> 5.2.6'
+-gem 'rails', '5.2.8'
++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'
@@ -22,10 +22,10 @@
  gem "mail", "~> 2.7.1"
 -gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')
 +gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '>= 3.1.1')
- gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1')
- gem 'i18n', '~> 1.8.2'
- gem "rbpdf", "~> 1.20.0"
-@@ -63,7 +63,7 @@ if File.exist?(database_file)
+ 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)
        when 'mysql2'
          gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]
        when /postgresql/
@@ -34,7 +34,7 @@
        when /sqlite3/
          gem "sqlite3", "~> 1.4.0", :platforms => [:mri, :mingw, :x64_mingw]
        when /sqlserver/
-@@ -80,26 +80,6 @@ else
+@@ -86,26 +86,6 @@ else
    warn("Please configure your config/database.yml first")
  end