Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3961985DA9 for ; Mon, 23 Oct 2023 14:51:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id AK9jd2Js5QXl for ; Mon, 23 Oct 2023 14:51:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2C97884D22 for ; Mon, 23 Oct 2023 14:51:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 25DFAFADC; Mon, 23 Oct 2023 14:51:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16980727103520" MIME-Version: 1.0 Date: Mon, 23 Oct 2023 14:51:50 +0000 From: "Takahiro Kambe" Subject: CVS commit: pkgsrc/devel/ruby-redmine50 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20231023145150.25DFAFADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_16980727103520 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Mon Oct 23 14:51:50 UTC 2023 Modified Files: pkgsrc/devel/ruby-redmine50: Makefile distinfo pkgsrc/devel/ruby-redmine50/patches: patch-Gemfile Log Message: devel/redmine50: update to 5.0.6 5.0.6 (2023-09-30) [Code cleanup/refactoring] * Defect #38797: Fix incorrect argument format for assert_select [Custom fields] * Defect #38464: Rendering a custom field with a URL pattern set and containing " :" in the value raises Addressable::URI::InvalidURIError [Gantt] * Defect #38728: Correctly escape issue text in Gantt PNG export for ImageMagick convert [Gems support] * Patch #39070: Allow using the latest version of mocha even when using Ruby < 2.7 [Groups] * Defect #38443: Cannot add a user to a group if the group is a member without roles in a certain project [PDF export] * Defect #37694: CommonMark Markdown task list item markers are not exported to PDF [Project settings] * Defect #37166: Roles of a project member should not be made empty [Projects] * Defect #38286: "Cannot delete enumeration" error may occur when attempting to delete a project with time entries [Rails support] * Patch #38374: Update Rails to 6.1.7.6 [Ruby support] * Defect #38617: Redmine 4.2 on Ruby 2.4 is not compatible with loofah 2.21 or higher [Security] * Defect #38539: Update Nokogiri to 1.15.2 in 5.0-stable and 4.2-stable * Defect #38807: XSS in Textile formatter * Defect #38806: XSS in Markdown formatter * Defect #38417: XSS Vulnerability in Thumbnails [Text formatting] * Defect #38697: Exception during thumbnail macro to image tag conversion in emails [Time tracking] * Defect #39079: NoMethodError when trying to remove the date of an existing time entry [Translations] * Defect #38507: Fix typo in French translation of setting_bulk_download_max_size * Patch #38533: Improve the clarity of German translation of label_user_mail_notify_about_high_priority_issues_html [UI] * Defect #33502: Issue field labels for fields with descriptions are missing styling on issues show view * Defect #38448: The margin below the Submit button on the issue edit page is too narrow * Patch #38359: Render numeric axes in charts as Integers To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/ruby-redmine50/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/ruby-redmine50/distinfo cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ruby-redmine50/patches/patch-Gemfile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16980727103520 Content-Disposition: inline Content-Length: 7016 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/ruby-redmine50/Makefile diff -u pkgsrc/devel/ruby-redmine50/Makefile:1.16 pkgsrc/devel/ruby-redmine50/Makefile:1.17 --- pkgsrc/devel/ruby-redmine50/Makefile:1.16 Sat Sep 9 13:52:56 2023 +++ pkgsrc/devel/ruby-redmine50/Makefile Mon Oct 23 14:51:49 2023 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2023/09/09 13:52:56 taca Exp $ +# $NetBSD: Makefile,v 1.17 2023/10/23 14:51:49 taca Exp $ DISTNAME= redmine-${RM_VERSION} PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/redmine/redmine${RM_VER}/} -PKGREVISION= 4 CATEGORIES= devel MASTER_SITES= https://www.redmine.org/releases/ @@ -11,7 +10,7 @@ HOMEPAGE= https://www.redmine.org/ COMMENT= Flexible project management web application LICENSE= gnu-gpl-v2 # and so on. -RM_VERSION= 5.0.5 +RM_VERSION= 5.0.6 NO_BUILD= yes @@ -33,9 +32,9 @@ DEPENDS+= ${RUBY_PKGPREFIX}-actionpack${ DEPENDS+= ${RUBY_PKGPREFIX}-roadie-rails${RUBY_RAILS}>=3.0.0<3.1:../../mail/ruby-roadie-rails 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}-nokogiri>=1.13.4:../../textproc/ruby-nokogiri +DEPENDS+= ${RUBY_PKGPREFIX}-nokogiri>=1.15<2:../../textproc/ruby-nokogiri DEPENDS+= ${RUBY_PKGPREFIX}-i18n>=1.10.0:../../devel/ruby-i18n -DEPENDS+= ${RUBY_PKGPREFIX}-rbpdf>=1.21.0<1.22:../../print/ruby-rbpdf +DEPENDS+= ${RUBY_PKGPREFIX}-rbpdf>=1.21.3<1.22:../../print/ruby-rbpdf DEPENDS+= ${RUBY_PKGPREFIX}-addressable>=0:../../net/ruby-addressable DEPENDS+= ${RUBY_PKGPREFIX}-zip>=2.3.0<2.4:../../archivers/ruby-zip DEPENDS+= ${RUBY_PKGPREFIX}-rotp>=6.2.0:../../security/ruby-rotp @@ -51,12 +50,6 @@ DEPENDS+= ${RUBY_PKGPREFIX}-sanitize>=6. .include "../../lang/ruby/modules.mk" .include "options.mk" -.if ${RUBY_VER} < 31 -DEPENDS+= ${RUBY_PKGPREFIX}-csv>=3.2.0<3.3:../../textproc/ruby-csv -DEPENDS+= ${RUBY_PKGPREFIX}-net-imap>=0.2.2<0.3:../../net/ruby-net-imap -DEPENDS+= ${RUBY_PKGPREFIX}-net-smtp>=0.3.0<0.4:../../net/ruby-net-smtp -.endif - REPLACE_RUBY+= ${DISTNAME}/bin/* REPLACE_RUBY+= ${DISTNAME}/extra/mail_handler/rdm-mailhandler.rb REPLACE_RUBY+= ${DISTNAME}/extra/svn/reposman.rb Index: pkgsrc/devel/ruby-redmine50/distinfo diff -u pkgsrc/devel/ruby-redmine50/distinfo:1.8 pkgsrc/devel/ruby-redmine50/distinfo:1.9 --- pkgsrc/devel/ruby-redmine50/distinfo:1.8 Wed May 24 18:21:20 2023 +++ pkgsrc/devel/ruby-redmine50/distinfo Mon Oct 23 14:51:49 2023 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.8 2023/05/24 18:21:20 triaxx Exp $ +$NetBSD: distinfo,v 1.9 2023/10/23 14:51:49 taca Exp $ -BLAKE2s (redmine-5.0.5.tar.gz) = d467f73578fcf9587b638c18f2304c31f6ba6f4e50190fb1846c6d8e3d9df8e7 -SHA512 (redmine-5.0.5.tar.gz) = 95b7926008ac3ed53b091a05793ad2372a5e9a5194629811f3cefe38c3b550971f0eb424fb5f7eb9fec0c014632c694d90859945544cadae987f7ddff31d6ce4 -Size (redmine-5.0.5.tar.gz) = 3115940 bytes -SHA1 (patch-Gemfile) = 46c2c2f56ff5a547ac6656f832d8efb58b06bc8c +BLAKE2s (redmine-5.0.6.tar.gz) = 4c56feac4c6ee6c9b1c8c813f81c8d877cb245395eb88d8bbfcc00671ec5f30b +SHA512 (redmine-5.0.6.tar.gz) = fa0b56ba2b24db9a752ae3cc977f2ef56c33ee4fe99154bfd2c5a449c3bc5f926f000002f23426ae4578a11d8f30121ae8707e39800168379baf546c5224e5ee +Size (redmine-5.0.6.tar.gz) = 3150234 bytes +SHA1 (patch-Gemfile) = 6878adb0249994654b6e0117ea214274b5d6db15 SHA1 (patch-config_additional__environment.rb.example) = 7ad913800c5f31fdd9b71aa92294bdbeea7b77fe SHA1 (patch-lib_redmine_scm_adapters_mercurial_redminehelper.py) = 87db1005896b2a962b8b93ec5b5b7d313ae6f691 SHA1 (patch-lib_tasks_initializers.rake) = 73c4594c94abd28e628bbd172565b161f0e54fff Index: pkgsrc/devel/ruby-redmine50/patches/patch-Gemfile diff -u pkgsrc/devel/ruby-redmine50/patches/patch-Gemfile:1.7 pkgsrc/devel/ruby-redmine50/patches/patch-Gemfile:1.8 --- pkgsrc/devel/ruby-redmine50/patches/patch-Gemfile:1.7 Thu Apr 27 13:56:06 2023 +++ pkgsrc/devel/ruby-redmine50/patches/patch-Gemfile Mon Oct 23 14:51:49 2023 @@ -1,15 +1,15 @@ -$NetBSD: patch-Gemfile,v 1.7 2023/04/27 13:56:06 taca Exp $ +$NetBSD: patch-Gemfile,v 1.8 2023/10/23 14:51:49 taca Exp $ * Relax dependency. * Do not load gem for developemt and test. ---- Gemfile.orig 2023-03-05 21:35:36.000000000 +0000 +--- Gemfile.orig 2023-09-30 06:40:03.000000000 +0000 +++ Gemfile @@ -3,9 +3,9 @@ source 'https://rubygems.org' ruby '>= 2.5.0', '< 3.2.0' gem 'bundler', '>= 1.12.0' --gem 'rails', '6.1.7.2' +-gem 'rails', '6.1.7.6' +gem 'rails', '~> 6.1.7' gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') -gem 'rouge', '~> 3.28.0' @@ -17,19 +17,20 @@ $NetBSD: patch-Gemfile,v 1.7 2023/04/27 gem 'request_store', '~> 1.5.0' gem 'mini_mime', '~> 1.1.0' gem "actionpack-xml_parser" -@@ -13,9 +13,9 @@ gem 'roadie-rails', (Gem.ruby_version < - gem 'marcel' - gem "mail", "~> 2.7.1" - gem 'csv', '~> 3.2.0' --gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '~> 1.13.10') -+gem 'nokogiri', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 1.12.5' : '~> 1.13') +@@ -18,10 +18,10 @@ gem 'nokogiri', (if Gem.ruby_version < G + elsif Gem.ruby_version < Gem::Version.new('2.7.0') + '~> 1.13.10' + else +- '~> 1.15.2' ++ '~> 1.15' + end) gem "rexml", require: false if Gem.ruby_version >= Gem::Version.new('3.0') -gem 'i18n', '~> 1.10.0' +gem 'i18n', '>= 1.10.0' - gem 'rbpdf', '~> 1.21.0' + gem 'rbpdf', '~> 1.21.3' gem 'addressable' gem 'rubyzip', '~> 2.3.0' -@@ -34,12 +34,12 @@ gem 'rqrcode' +@@ -40,12 +40,12 @@ gem 'rqrcode' # Optional gem for LDAP authentication group :ldap do @@ -44,7 +45,7 @@ $NetBSD: patch-Gemfile,v 1.7 2023/04/27 end # Optional Markdown support, not for JRuby -@@ -48,7 +48,7 @@ gem 'redcarpet', '~> 3.5.1', groups: [:m +@@ -54,7 +54,7 @@ gem 'redcarpet', '~> 3.5.1', groups: [:m # Optional CommonMark support, not for JRuby group :common_mark do @@ -53,7 +54,7 @@ $NetBSD: patch-Gemfile,v 1.7 2023/04/27 gem "commonmarker", (Gem.ruby_version < Gem::Version.new('2.6.0') ? '0.21.0' : '~> 0.23.8') gem "sanitize", "~> 6.0" gem 'deckar01-task_list', '2.3.2' -@@ -69,7 +69,7 @@ if File.exist?(database_file) +@@ -75,7 +75,7 @@ if File.exist?(database_file) when 'mysql2' gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] when /postgresql/ @@ -62,7 +63,7 @@ $NetBSD: patch-Gemfile,v 1.7 2023/04/27 when /sqlite3/ gem "sqlite3", "~> 1.4.0", :platforms => [:mri, :mingw, :x64_mingw] when /sqlserver/ -@@ -86,6 +86,7 @@ else +@@ -92,6 +92,7 @@ else warn("Please configure your config/database.yml first") end @@ -70,7 +71,7 @@ $NetBSD: patch-Gemfile,v 1.7 2023/04/27 group :development do gem 'listen', '~> 3.3' gem "yard" -@@ -112,6 +113,7 @@ group :test do +@@ -118,6 +119,7 @@ group :test do gem 'rubocop-performance', '~> 1.13.0' gem 'rubocop-rails', '~> 2.14.0' end --_----------=_16980727103520--