summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspz <spz@pkgsrc.org>2022-06-04 09:31:41 +0000
committerspz <spz@pkgsrc.org>2022-06-04 09:31:41 +0000
commitfc5049daded3d2c4194326cfc92c5e538d77a6aa (patch)
tree3db76e6b62e4699e399041f8dc89140571782ad4
parent630358aab72a96e477c2936962afc1b2e787794a (diff)
downloadpkgsrc-fc5049daded3d2c4194326cfc92c5e538d77a6aa.tar.gz
Pullup ticket #6630 - requested by taca
databases/ruby-activerecord61: security update devel/ruby-activejob61: security update devel/ruby-activemodel61: security update devel/ruby-activestorage61: security update devel/ruby-activesupport61: security update devel/ruby-railties61: security update lang/ruby: version info update mail/ruby-actionmailbox61: security update mail/ruby-actionmailer61: security update textproc/ruby-actiontext61: security update www/ruby-actioncable61: security update www/ruby-actionpack61: security update www/ruby-actionview61: security update www/ruby-rails61: security update Revisions pulled up: - databases/ruby-activerecord61/distinfo 1.12 - devel/ruby-activejob61/distinfo 1.12 - devel/ruby-activemodel61/distinfo 1.12 - devel/ruby-activestorage61/Makefile 1.5 - devel/ruby-activestorage61/distinfo 1.12 - devel/ruby-activesupport61/Makefile 1.4 - devel/ruby-activesupport61/distinfo 1.12 - devel/ruby-railties61/distinfo 1.12 - lang/ruby/rails.mk 1.121 - mail/ruby-actionmailbox61/PLIST 1.2 - mail/ruby-actionmailbox61/distinfo 1.12 - mail/ruby-actionmailer61/PLIST 1.2 - mail/ruby-actionmailer61/distinfo 1.12 - textproc/ruby-actiontext61/distinfo 1.12 - www/ruby-actioncable61/distinfo 1.12 - www/ruby-actionpack61/distinfo 1.12 - www/ruby-actionview61/distinfo 1.12 - www/ruby-rails61/distinfo 1.12 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: taca Date: Thu May 5 03:38:25 UTC 2022 Modified Files: pkgsrc/lang/ruby: rails.mk Log Message: lang/ruby/rails.mk: Really update of Ruby on Rails to 6.1.5.1 To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.121 pkgsrc/lang/ruby/rails.mk ------------------------------------------------------------------- Module Name: pkgsrc Committed By: taca Date: Thu May 5 03:28:21 UTC 2022 Modified Files: pkgsrc/devel/ruby-activesupport61: Makefile distinfo Log Message: devel/ruby-activesupport61: update to 6.1.5.1 ## Rails 6.1.5.1 (April 26, 2022) ## * Fix and add protections for XSS in `ActionView::Helpers` and `ERB::Util`. Add the method `ERB::Util.xml_name_escape` to escape dangerous characters in names of tags and names of attributes, following the specification of XML. *Álvaro Martín Fraguas* ## Rails 6.1.5 (March 09, 2022) ## * Fix `ActiveSupport::Duration.build` to support negative values. The algorithm to collect the `parts` of the `ActiveSupport::Duration` ignored the sign of the `value` and accumulated incorrect part values. This impacted `ActiveSupport::Duration#sum` (which is dependent on `parts`) but not `ActiveSupport::Duration#eql?` (which is dependent on `value`). *Caleb Buxton*, *Braden Staudacher* * `Time#change` and methods that call it (eg. `Time#advance`) will now return a `Time` with the timezone argument provided, if the caller was initialized with a timezone argument. Fixes [#42467](https://github.com/rails/rails/issues/42467). *Alex Ghiculescu* * Clone to keep extended Logger methods for tagged logger. *Orhan Toy* * `assert_changes` works on including `ActiveSupport::Assertions` module. *Pedro Medeiros* To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ruby-activesupport61/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ruby-activesupport61/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: taca Date: Thu May 5 03:28:57 UTC 2022 Modified Files: pkgsrc/devel/ruby-activemodel61: distinfo Log Message: devel/ruby-activemodel61: update to 6.1.5.1 ## Rails 6.1.5.1 (April 26, 2022) ## * No changes. ## Rails 6.1.5 (March 09, 2022) ## * Clear secure password cache if password is set to `nil` Before: user.password = 'something' user.password = nil user.password # => 'something' Now: user.password = 'something' user.password = nil user.password # => nil *Markus Doits* * Fix delegation in `ActiveModel::Type::Registry#lookup` and `ActiveModel::Type.lookup` Passing a last positional argument `{}` would be incorrectly considered as keyword argument. *Benoit Daloze* * Fix `to_json` after `changes_applied` for `ActiveModel::Dirty` object. *Ryuta Kamizono* To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ruby-activemodel61/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: taca Date: Thu May 5 03:29:32 UTC 2022 Modified Files: pkgsrc/www/ruby-actionview61: distinfo Log Message: www/ruby-actionview61: update to 6.1.5.1 ## Rails 6.1.5.1 (April 26, 2022) ## * Fix and add protections for XSS in `ActionView::Helpers` and `ERB::Util`. Escape dangerous characters in names of tags and names of attributes in the tag helpers, following the XML specification. Rename the option `:escape_attributes` to `:escape`, to simplify by applying the option to the whole tag. *Álvaro Martín Fraguas* ## Rails 6.1.5 (March 09, 2022) ## * `preload_link_tag` properly inserts `as` attributes for files with `image` MIME types, such as JPG or SVG. *Nate Berkopec* * Add `autocomplete="off"` to all generated hidden fields. Fixes #42610. *Ryan Baumann* * Fix `current_page?` when URL has trailing slash. This fixes the `current_page?` helper when the given URL has a trailing slash, and is an absolute URL or also has query params. Fixes #33956. *Jonathan Hefner* To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/ruby-actionview61/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: taca Date: Thu May 5 03:30:02 UTC 2022 Modified Files: pkgsrc/www/ruby-actionpack61: distinfo Log Message: www/ruby-actionpack61: update to 6.1.5.1 ## Rails 6.1.5.1 (April 26, 2022) ## * Allow Content Security Policy DSL to generate for API responses. *Tim Wade* ## Rails 6.1.5 (March 09, 2022) ## * Fix `content_security_policy` returning invalid directives. Directives such as `self`, `unsafe-eval` and few others were not single quoted when the directive was the result of calling a lambda returning an array. ```ruby content_security_policy do |policy| policy.frame_ancestors lambda { [:self, "https://example.com"] } end ``` With this fix the policy generated from above will now be valid. *Edouard Chin* * Update `HostAuthorization` middleware to render debug info only when `config.consider_all_requests_local` is set to true. Also, blocked host info is always logged with level `error`. Fixes #42813. *Nikita Vyrko* * Dup arrays that get "converted". Fixes #43681. *Aaron Patterson* * Don't show deprecation warning for equal paths. *Anton Rieder* * Fix crash in `ActionController::Instrumentation` with invalid HTTP formats. Fixes #43094. *Alex Ghiculescu* * Add fallback host for SystemTestCase driven by RackTest. Fixes #42780. *Petrik de Heus* * Add more detail about what hosts are allowed. *Alex Ghiculescu* To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/ruby-actionpack61/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: taca Date: Thu May 5 03:30:33 UTC 2022 Modified Files: pkgsrc/databases/ruby-activerecord61: distinfo Log Message: databases/ruby-activerecord61: update to 6.1.5.1 ## Rails 6.1.5.1 (April 26, 2022) ## * No changes. ## Rails 6.1.5 (March 09, 2022) ## * Fix `ActiveRecord::ConnectionAdapters::SchemaCache#deep_deduplicate` for Ruby 2.6. Ruby 2.6 and 2.7 have slightly different implementations of the `String#@-` method. In Ruby 2.6, the receiver of the `String#@-` method is modified under certain circumstances. This was later identified as a bug (https://bugs.ruby-lang.org/issues/15926) and only fixed in Ruby 2.7. Before the changes in this commit, the `ActiveRecord::ConnectionAdapters::SchemaCache#deep_deduplicate` method, which internally calls the `String#@-` method, could also modify an input string argument in Ruby 2.6 -- changing a tainted, unfrozen string into a tainted, frozen string. Fixes #43056 *Eric O'Hanlon* * Fix migration compatibility to create SQLite references/belongs_to column as integer when migration version is 6.0. `reference`/`belongs_to` in migrations with version 6.0 were creating columns as bigint instead of integer for the SQLite Adapter. *Marcelo Lauxen* * Fix dbconsole for 3-tier config. *Eileen M. Uchitelle* * Better handle SQL queries with invalid encoding. ```ruby Post.create(name: "broken \xC8 UTF-8") ``` Would cause all adapters to fail in a non controlled way in the code responsible to detect write queries. The query is now properly passed to the database connection, which might or might not be able to handle it, but will either succeed or failed in a more correct way. *Jean Boussier* * Ignore persisted in-memory records when merging target lists. *Kevin Sjöberg* * Fix regression bug that caused ignoring additional conditions for preloading `has_many` through relations. Fixes #43132 *Alexander Pauly* * Fix `ActiveRecord::InternalMetadata` to not be broken by `config.active_record.record_timestamps = false` Since the model always create the timestamp columns, it has to set them, otherwise it breaks various DB management tasks. Fixes #42983 *Jean Boussier* * Fix duplicate active record objects on `inverse_of`. *Justin Carvalho* * Fix duplicate objects stored in has many association after save. Fixes #42549. *Alex Ghiculescu* * Fix performance regression in `CollectionAssocation#build`. *Alex Ghiculescu* * Fix retrieving default value for text column for MariaDB. *fatkodima* To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/ruby-activerecord61/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: taca Date: Thu May 5 03:31:02 UTC 2022 Modified Files: pkgsrc/devel/ruby-activestorage61: Makefile distinfo Log Message: devel/ruby-activestorage61: update to 6.1.5.1 ## Rails 6.1.5.1 (April 26, 2022) ## * No changes. ## Rails 6.1.5 (March 09, 2022) ## * Attachments can be deleted after their association is no longer defined. Fixes #42514 *Don Sisco* To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ruby-activestorage61/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ruby-activestorage61/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: taca Date: Thu May 5 03:31:47 UTC 2022 Modified Files: pkgsrc/mail/ruby-actionmailbox61: PLIST distinfo Log Message: mail/ruby-actionmailbox61: update to 6.1.5.1 ## Rails 6.1.5.1 (April 26, 2022) ## * No changes. ## Rails 6.1.5 (March 09, 2022) ## * Add `attachments` to the list of permitted parameters for inbound emails conductor. When using the conductor to test inbound emails with attachments, this prevents an unpermitted parameter warning in default configurations, and prevents errors for applications that set: ```ruby config.action_controller.action_on_unpermitted_parameters = :raise ``` *David Jones*, *Dana Henke* To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/ruby-actionmailbox61/PLIST cvs rdiff -u -r1.11 -r1.12 pkgsrc/mail/ruby-actionmailbox61/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: taca Date: Thu May 5 03:32:28 UTC 2022 Modified Files: pkgsrc/www/ruby-actioncable61: distinfo Log Message: www/ruby-actioncable61: update to 6.1.5.1 ## Rails 6.1.5.1 (April 26, 2022) ## * No changes. ## Rails 6.1.5 (March 09, 2022) ## * The Action Cable client now ensures successful channel subscriptions: * The client maintains a set of pending subscriptions until either the server confirms the subscription or the channel is torn down. * Rectifies the race condition where an unsubscribe is rapidly followed by a subscribe (on the same channel identifier) and the requests are handled out of order by the ActionCable server, thereby ignoring the subscribe command. *Daniel Spinosa* * Truncate broadcast logging messages. *J Smith* To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/ruby-actioncable61/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: taca Date: Thu May 5 03:32:59 UTC 2022 Modified Files: pkgsrc/devel/ruby-railties61: distinfo Log Message: devel/ruby-railties61: update to 6.1.5.1 ## Rails 6.1.5.1 (April 26, 2022) ## * No changes. ## Rails 6.1.5 (March 09, 2022) ## * In `zeitwerk` mode, setup the `once` autoloader first, and the `main` autoloader after it. This order plays better with shared namespaces. *Xavier Noria* * Handle paths with spaces when editing credentials. *Alex Ghiculescu* * Support Psych 4 when loading secrets. *Nat Morcos* To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ruby-railties61/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: taca Date: Thu May 5 03:33:27 UTC 2022 Modified Files: pkgsrc/textproc/ruby-actiontext61: distinfo Log Message: textproc/ruby-actiontext61: update to 6.1.5.1 ## Rails 6.1.5.1 (April 26, 2022) ## * No changes. ## Rails 6.1.5 (March 09, 2022) ## * Fix Action Text extra trix content wrapper. *Alexandre Ruban* To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/ruby-actiontext61/distinfo ------------------------------------------------------------------- Module Name: pkgsrc Committed By: taca Date: Thu May 5 03:34:37 UTC 2022 Modified Files: pkgsrc/devel/ruby-activejob61: distinfo pkgsrc/mail/ruby-actionmailer61: PLIST distinfo pkgsrc/www/ruby-rails61: distinfo Log Message: Update rest of Ruby on Rails 61 components. No change except version. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ruby-activejob61/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/ruby-actionmailer61/PLIST cvs rdiff -u -r1.11 -r1.12 pkgsrc/mail/ruby-actionmailer61/distinfo cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/ruby-rails61/distinfo
-rw-r--r--databases/ruby-activerecord61/distinfo8
-rw-r--r--devel/ruby-activejob61/distinfo8
-rw-r--r--devel/ruby-activemodel61/distinfo8
-rw-r--r--devel/ruby-activestorage61/Makefile4
-rw-r--r--devel/ruby-activestorage61/distinfo8
-rw-r--r--devel/ruby-activesupport61/Makefile4
-rw-r--r--devel/ruby-activesupport61/distinfo8
-rw-r--r--devel/ruby-railties61/distinfo8
-rw-r--r--lang/ruby/rails.mk4
-rw-r--r--mail/ruby-actionmailbox61/PLIST3
-rw-r--r--mail/ruby-actionmailbox61/distinfo8
-rw-r--r--mail/ruby-actionmailer61/PLIST3
-rw-r--r--mail/ruby-actionmailer61/distinfo8
-rw-r--r--textproc/ruby-actiontext61/distinfo8
-rw-r--r--www/ruby-actioncable61/distinfo8
-rw-r--r--www/ruby-actionpack61/distinfo8
-rw-r--r--www/ruby-actionview61/distinfo8
-rw-r--r--www/ruby-rails61/distinfo8
18 files changed, 62 insertions, 60 deletions
diff --git a/databases/ruby-activerecord61/distinfo b/databases/ruby-activerecord61/distinfo
index 76c27e1ca99..597146844a2 100644
--- a/databases/ruby-activerecord61/distinfo
+++ b/databases/ruby-activerecord61/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/03/13 15:11:51 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/04 09:31:41 spz Exp $
-BLAKE2s (activerecord-6.1.4.7.gem) = b8ce61e4baaa9099c3c22605bfd8d11cbeb31217e74182f75f3097fbfc1209c4
-SHA512 (activerecord-6.1.4.7.gem) = 371b9832b7c264b859b4baed54672da4d00127fc5fb1728d81bcc15d28335bfeaf7bf69114e69e2d5b5285de932efd9d88e93e2e35281f92e0490626824ec8d8
-Size (activerecord-6.1.4.7.gem) = 430592 bytes
+BLAKE2s (activerecord-6.1.5.1.gem) = a0af64fdab45ecf8a5407b332056daced301fad947094a988b10507f7e890f67
+SHA512 (activerecord-6.1.5.1.gem) = 2aa385079e34065185997605345380a2cda70d9770c2b5501af6de3e77574edf48b6694052957d6bd9b3bf8f67c461ed47abaff87f81a9216115933e77e2acc4
+Size (activerecord-6.1.5.1.gem) = 432128 bytes
diff --git a/devel/ruby-activejob61/distinfo b/devel/ruby-activejob61/distinfo
index 662341b20e2..c1bd6f83989 100644
--- a/devel/ruby-activejob61/distinfo
+++ b/devel/ruby-activejob61/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/03/13 15:11:50 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/04 09:31:41 spz Exp $
-BLAKE2s (activejob-6.1.4.7.gem) = 0f7db5ef5b8cf5031a143fd20906c4e188ba344390830e05883fd36ac2fecf4d
-SHA512 (activejob-6.1.4.7.gem) = b4ef6cf7a84302490a040efb4a7519d3f4452cbc1b5f13b4e83d0ee851dae111604b2a8211e6292668348afb429e2c4a9acd0013a6798f685964fd27e7857bde
-Size (activejob-6.1.4.7.gem) = 32768 bytes
+BLAKE2s (activejob-6.1.5.1.gem) = af53c43fbc9df1b47ab93c323880d46fc726fa5f0fe3b92e87218eddd4432867
+SHA512 (activejob-6.1.5.1.gem) = b3961cc784e6ebf7799db312e305f8fa679c773d65fff12a7459b3798e3c689f449db1823e9f20ec2a56074df3bb12ade2b9e9c55c951d8e7bd5f0e7c71ec66c
+Size (activejob-6.1.5.1.gem) = 32768 bytes
diff --git a/devel/ruby-activemodel61/distinfo b/devel/ruby-activemodel61/distinfo
index a9628781dd8..c52728f561c 100644
--- a/devel/ruby-activemodel61/distinfo
+++ b/devel/ruby-activemodel61/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/03/13 15:11:50 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/04 09:31:41 spz Exp $
-BLAKE2s (activemodel-6.1.4.7.gem) = 4502bbd15b21e76a4c684150a22bcf852bc024b486ee5df17d2a0ba126b565a4
-SHA512 (activemodel-6.1.4.7.gem) = b27341b6446e36985c3bf3500ca567d1a6d25f40b7b584ec955a5cce2a00423840437594c5b53c557501d7c6dd0718fc952407ca2ce7b584afa1004853f47967
-Size (activemodel-6.1.4.7.gem) = 62464 bytes
+BLAKE2s (activemodel-6.1.5.1.gem) = 814342ebe451f37056ee312f909570a6aef11cbafc17d6184f92855315752a4f
+SHA512 (activemodel-6.1.5.1.gem) = 6798d3677d5361f83a203eddd9ccbe4657362548e9daf329b950e7ba3f610c3be775cb28b12d5f645634318e956c3eb65b42dba398e31e0324627d9a54b53680
+Size (activemodel-6.1.5.1.gem) = 62464 bytes
diff --git a/devel/ruby-activestorage61/Makefile b/devel/ruby-activestorage61/Makefile
index 43a5c6c2daa..5adf2bd2112 100644
--- a/devel/ruby-activestorage61/Makefile
+++ b/devel/ruby-activestorage61/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/03/27 06:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2022/06/04 09:31:41 spz Exp $
DISTNAME= activestorage-${RAILS_VERSION}
PKGNAME= ${RUBY_PKGPREFIX}-activestorage${RUBY_RAILS}-${RAILS_VERSION}
@@ -13,7 +13,7 @@ DEPENDS+= ${RUBY_ACTIONPACK_DEPENDS}
DEPENDS+= ${RUBY_ACTIVEJOB_DEPENDS}
DEPENDS+= ${RUBY_ACTIVERECORD_DEPENDS}
DEPENDS+= ${RUBY_PKGPREFIX}-marcel>=1.0.0<1.1:../../devel/ruby-marcel
-#DEPDENS+= ${RUBY_PKGPREFIX}-mini_mime>=1.0.2:../../mail/ruby-mini_mime
+DEPDENS+= ${RUBY_PKGPREFIX}-mini_mime>=1.1.0:../../mail/ruby-mini_mime
USE_LANGUAGES= # none
diff --git a/devel/ruby-activestorage61/distinfo b/devel/ruby-activestorage61/distinfo
index 2daa9206d35..bb0a23d78fe 100644
--- a/devel/ruby-activestorage61/distinfo
+++ b/devel/ruby-activestorage61/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/03/13 15:11:51 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/04 09:31:41 spz Exp $
-BLAKE2s (activestorage-6.1.4.7.gem) = d9dafd14770e107cf64c5c3ba771deaf12fd4ec91b48a50dd2d6dda7055dc33c
-SHA512 (activestorage-6.1.4.7.gem) = c64da9deb46d29d7d62e2072aed901e81d51e4697ea3fbcf3d764aaee00bd9e8da8c30539f3ba27630e6e929fefdb6f2fe09e5d8743e725abd0d984a35d1273f
-Size (activestorage-6.1.4.7.gem) = 57344 bytes
+BLAKE2s (activestorage-6.1.5.1.gem) = 7fbd5941b5b3a094a6bf1e42cbd093816e2d09cafaee85e0a96b817998d8716d
+SHA512 (activestorage-6.1.5.1.gem) = bd447549f4a8462f976d8bd1c4a7bb26db89d1738c9f88e75dc87fb008374b0b6b3fd1e5ea77a677ab7cb434dac8b4485a2ec8aac86652817c89c3f634e846e1
+Size (activestorage-6.1.5.1.gem) = 57856 bytes
diff --git a/devel/ruby-activesupport61/Makefile b/devel/ruby-activesupport61/Makefile
index 09abd1c303e..fee7fac47aa 100644
--- a/devel/ruby-activesupport61/Makefile
+++ b/devel/ruby-activesupport61/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/03/27 06:31:56 wiz Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2022/06/04 09:31:41 spz Exp $
DISTNAME= activesupport-${RAILS_VERSION}
PKGNAME= ${RUBY_PKGPREFIX}-activesupport${RUBY_RAILS}-${RAILS_VERSION}
@@ -12,7 +12,7 @@ LICENSE= mit
DEPENDS+= ${RUBY_PKGPREFIX}-i18n>=1.6:../../devel/ruby-i18n
DEPENDS+= ${RUBY_PKGPREFIX}-tzinfo>=2.0<3:../../time/ruby-tzinfo
DEPENDS+= ${RUBY_PKGPREFIX}-concurrent-ruby>=1.0<2:../../devel/ruby-concurrent-ruby
-DEPENDS+= ${RUBY_PKGPREFIX}-zeitwerk>=2.2<3:../../devel/ruby-zeitwerk
+DEPENDS+= ${RUBY_PKGPREFIX}-zeitwerk>=2.3<3:../../devel/ruby-zeitwerk
# minitest 5.4.3 is bundled with Ruby 2.2 and later.
#DEPENDS+= ${RUBY_PKGPREFIX}-minitest>=5.1<6:../../devel/ruby-minitest
diff --git a/devel/ruby-activesupport61/distinfo b/devel/ruby-activesupport61/distinfo
index 45e88e90090..d042a281ee9 100644
--- a/devel/ruby-activesupport61/distinfo
+++ b/devel/ruby-activesupport61/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/03/13 15:11:50 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/04 09:31:41 spz Exp $
-BLAKE2s (activesupport-6.1.4.7.gem) = dca85318e9a9d3a90a4697d4e654e122d0f9350a594ff8b22f16bc906bc07980
-SHA512 (activesupport-6.1.4.7.gem) = 39a59530f016dcf1db8a1c56bbcf77ec4f0ba11201844a65a2e2ebefbfc5f670f3b0b481d4ef7d79e4e1a1bdad12034376fc220fa36592e554fa6c03cfe46f41
-Size (activesupport-6.1.4.7.gem) = 219648 bytes
+BLAKE2s (activesupport-6.1.5.1.gem) = 337af410ef63ec55c9cfb752ed519287e29ac9f965dc61892458f0b78c00c285
+SHA512 (activesupport-6.1.5.1.gem) = d3e2e442236e5abea3d3bd258d782e1406ebfd66840104bc5d1f4830c2e3b058cfb0f0d0cf097d4e261fd291a1e56e89c2c6a5664927ca3c3a8f366f139333fc
+Size (activesupport-6.1.5.1.gem) = 220672 bytes
diff --git a/devel/ruby-railties61/distinfo b/devel/ruby-railties61/distinfo
index 55f6204e174..b2aa51414fe 100644
--- a/devel/ruby-railties61/distinfo
+++ b/devel/ruby-railties61/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/03/13 15:11:51 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/04 09:31:41 spz Exp $
-BLAKE2s (railties-6.1.4.7.gem) = d4a1793c578482803bdaab269b9f0ecf2bcd046bef1a71d576b2cfd68b2095f8
-SHA512 (railties-6.1.4.7.gem) = 1c2c254c694fca4b6951592f65d7b305f5cfbd393a1dccd82d39bf55943916f694e930b829390a0df8e7fbcce5cac10a03e1844e2a04caa6a6b0b0d43c62119f
-Size (railties-6.1.4.7.gem) = 457216 bytes
+BLAKE2s (railties-6.1.5.1.gem) = 6cdb581daf4c18a01d3e77c8801a56e3850bc703f4edbfbb36cc47c3c04e1a20
+SHA512 (railties-6.1.5.1.gem) = 49ac6af62ff7ad7224b9c44c81ed43995fbee5f10288cd8aabf66a6a8f6fd229be0aef9ec4e9c70d4b6d556614ea552377bf91da9871eb36f4c9f1995c020b3f
+Size (railties-6.1.5.1.gem) = 457216 bytes
diff --git a/lang/ruby/rails.mk b/lang/ruby/rails.mk
index 2e4781ddaa7..51b84e761d8 100644
--- a/lang/ruby/rails.mk
+++ b/lang/ruby/rails.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rails.mk,v 1.118.2.2 2022/06/04 09:17:03 spz Exp $
+# $NetBSD: rails.mk,v 1.118.2.3 2022/06/04 09:31:41 spz Exp $
.if !defined(_RUBY_RAILS_MK)
_RUBY_RAILS_MK= # defined
@@ -49,7 +49,7 @@ _RUBY_RAILS_MK= # defined
#
RUBY_RAILS52_VERSION?= 5.2.7.1
RUBY_RAILS60_VERSION?= 6.0.4.8
-RUBY_RAILS61_VERSION?= 6.1.4.7
+RUBY_RAILS61_VERSION?= 6.1.5.1
RUBY_RAILS70_VERSION?= 7.0.2.3
RUBY_RAILS_ACCEPTED?= # defined
diff --git a/mail/ruby-actionmailbox61/PLIST b/mail/ruby-actionmailbox61/PLIST
index 2f8dc130f82..e4c01f4af05 100644
--- a/mail/ruby-actionmailbox61/PLIST
+++ b/mail/ruby-actionmailbox61/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/02/14 14:02:59 taca Exp $
+@comment $NetBSD: PLIST,v 1.1.10.1 2022/06/04 09:31:42 spz Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_LIBDIR}/CHANGELOG.md
${GEM_LIBDIR}/MIT-LICENSE
@@ -39,6 +39,7 @@ ${GEM_LIBDIR}/lib/action_mailbox/mail_ext/address_wrapping.rb
${GEM_LIBDIR}/lib/action_mailbox/mail_ext/addresses.rb
${GEM_LIBDIR}/lib/action_mailbox/mail_ext/from_source.rb
${GEM_LIBDIR}/lib/action_mailbox/mail_ext/recipients.rb
+${GEM_LIBDIR}/lib/action_mailbox/mail_with_error_handling.rb
${GEM_LIBDIR}/lib/action_mailbox/relayer.rb
${GEM_LIBDIR}/lib/action_mailbox/router.rb
${GEM_LIBDIR}/lib/action_mailbox/router/route.rb
diff --git a/mail/ruby-actionmailbox61/distinfo b/mail/ruby-actionmailbox61/distinfo
index 7cded5abf2f..fba9dbe7280 100644
--- a/mail/ruby-actionmailbox61/distinfo
+++ b/mail/ruby-actionmailbox61/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/03/13 15:11:51 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/04 09:31:42 spz Exp $
-BLAKE2s (actionmailbox-6.1.4.7.gem) = 25830260070385b9118c350cc42639bdc54cd794b5028d6929c39215a039a772
-SHA512 (actionmailbox-6.1.4.7.gem) = 98695b94e4ff60ceb523a7c400bdaf7e0c815ebc6f59631f2b3c1dfa1bced3c20cefe764e47bed04f48b3d12f4b2c3ce4a31c33d7023ce651a8bd20af4923eab
-Size (actionmailbox-6.1.4.7.gem) = 22016 bytes
+BLAKE2s (actionmailbox-6.1.5.1.gem) = c291557cf00aa42dbcae8ef7fd8ae0057940c9d5a27b7914395f55193e3861d6
+SHA512 (actionmailbox-6.1.5.1.gem) = 2850e76c008a2c39f68fa7fe2c5ef2a13acad9abc4d4141d8c21177665a31e3dcf0eeb7ec3464e5988e8f372110868453db0c36660218f415af57955bc8e6d93
+Size (actionmailbox-6.1.5.1.gem) = 22528 bytes
diff --git a/mail/ruby-actionmailer61/PLIST b/mail/ruby-actionmailer61/PLIST
index 944c41ea898..940944af872 100644
--- a/mail/ruby-actionmailer61/PLIST
+++ b/mail/ruby-actionmailer61/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/02/14 14:02:22 taca Exp $
+@comment $NetBSD: PLIST,v 1.1.10.1 2022/06/04 09:31:42 spz Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_LIBDIR}/CHANGELOG.md
${GEM_LIBDIR}/MIT-LICENSE
@@ -13,6 +13,7 @@ ${GEM_LIBDIR}/lib/action_mailer/inline_preview_interceptor.rb
${GEM_LIBDIR}/lib/action_mailer/log_subscriber.rb
${GEM_LIBDIR}/lib/action_mailer/mail_delivery_job.rb
${GEM_LIBDIR}/lib/action_mailer/mail_helper.rb
+${GEM_LIBDIR}/lib/action_mailer/mail_with_error_handling.rb
${GEM_LIBDIR}/lib/action_mailer/message_delivery.rb
${GEM_LIBDIR}/lib/action_mailer/parameterized.rb
${GEM_LIBDIR}/lib/action_mailer/preview.rb
diff --git a/mail/ruby-actionmailer61/distinfo b/mail/ruby-actionmailer61/distinfo
index 20d74e40511..48338cc244e 100644
--- a/mail/ruby-actionmailer61/distinfo
+++ b/mail/ruby-actionmailer61/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/03/13 15:11:51 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/04 09:31:42 spz Exp $
-BLAKE2s (actionmailer-6.1.4.7.gem) = 80da85f7ab6abd68e9773064bb3e99f55b8f6ef3efa1c9fa48474cd07f549eda
-SHA512 (actionmailer-6.1.4.7.gem) = 2bfaa3a6dabd9bc1a44fdfa63820013004c08abca65881f6e88e2876936a684064a58b11bebf63bf329eccc47072381350ee01f758456dcd8cf00f8eb667eb66
-Size (actionmailer-6.1.4.7.gem) = 30720 bytes
+BLAKE2s (actionmailer-6.1.5.1.gem) = 39ad9366cdd5ba092dd426e4de94c325e39cd8f15136534a3ea0c26eafb98e9f
+SHA512 (actionmailer-6.1.5.1.gem) = bfb5826c36348822e93c14b24990fd5fda99455b8c054820c0258c9cec1d732bdde9fd0960ffdc1fdac5dcf31cf3beb1784c040afa67dba096038f5c865dcbfc
+Size (actionmailer-6.1.5.1.gem) = 30720 bytes
diff --git a/textproc/ruby-actiontext61/distinfo b/textproc/ruby-actiontext61/distinfo
index 2136643e804..1e1b8cecb15 100644
--- a/textproc/ruby-actiontext61/distinfo
+++ b/textproc/ruby-actiontext61/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/03/13 15:11:51 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/04 09:31:42 spz Exp $
-BLAKE2s (actiontext-6.1.4.7.gem) = c3309bb0c3da9bd49ed7c717c7da9bc3ab3892e307b0f334e0177359a8a1f634
-SHA512 (actiontext-6.1.4.7.gem) = be96b682b7c742be4ac669d58a247560d2204b9ef75c0c3431f2d9b3126fbf1a15eaa0bcdf8a9034e5fede3eafb770a36e50719b55985a1dad1eb477827e7e50
-Size (actiontext-6.1.4.7.gem) = 19456 bytes
+BLAKE2s (actiontext-6.1.5.1.gem) = a623b7ecd31d45a15d26f5760ce2f4be38d316a27def5d6bb1799a1f8f440d97
+SHA512 (actiontext-6.1.5.1.gem) = ea2641bb9364fbeb7e20351edc3711d9131efdf7ab00e261963b01e7070a55a027befe186bb4e26df10fc418773f5442ce57e82f689e54f36b167b08df7b0779
+Size (actiontext-6.1.5.1.gem) = 19456 bytes
diff --git a/www/ruby-actioncable61/distinfo b/www/ruby-actioncable61/distinfo
index 446c384a1f9..7088f0ad685 100644
--- a/www/ruby-actioncable61/distinfo
+++ b/www/ruby-actioncable61/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/03/13 15:11:51 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/04 09:31:42 spz Exp $
-BLAKE2s (actioncable-6.1.4.7.gem) = 6931db04664bef7e8e4826011c63b04d5bfd86ae8a0c29e16234ba4f71d4ea1d
-SHA512 (actioncable-6.1.4.7.gem) = ac609b545ddfb3876a547375de890280a11d171822f0b834df01d98e0c005a7b05a01357cdbad1190f5d98393891c3f8c78bb702c7e2a93381f265d272b016f1
-Size (actioncable-6.1.4.7.gem) = 41984 bytes
+BLAKE2s (actioncable-6.1.5.1.gem) = 50c28a35612736525f40133e0081e94c17c55125d43631d8dd41d5a3d65a8700
+SHA512 (actioncable-6.1.5.1.gem) = 7547cc47f528456ba65d22e2e90faae55b14063f557dd2da3d1a91e3286134a6656c0c32437e208fd95788a07bb7d2b4ce53bbf7563e98da24aee47d5d6d1780
+Size (actioncable-6.1.5.1.gem) = 42496 bytes
diff --git a/www/ruby-actionpack61/distinfo b/www/ruby-actionpack61/distinfo
index 5655fa80660..5f7878f2b2d 100644
--- a/www/ruby-actionpack61/distinfo
+++ b/www/ruby-actionpack61/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/03/13 15:11:51 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/04 09:31:42 spz Exp $
-BLAKE2s (actionpack-6.1.4.7.gem) = fe63d6c3393244bf557a13b36ddabdb2f31088fd67050448a7035826892bf95f
-SHA512 (actionpack-6.1.4.7.gem) = f39df0f62cef761780f46d20a8a6a9676256d89ae74503db10258f54883eab643ff0adbc67a564722c4425bdc07677902bb1db042cc04f856cdaa54b278db7d4
-Size (actionpack-6.1.4.7.gem) = 225792 bytes
+BLAKE2s (actionpack-6.1.5.1.gem) = 17450f6073056c694f1a909f6ae026e3f813affd4fbb969a37c11dd5f3ddf0b1
+SHA512 (actionpack-6.1.5.1.gem) = d5c19f186663739a973c6c5b12eda8a372fdc24d530759fcf322ceb84665884bbcbbffee2795eac2482d033702edbd07b3bad0b76e84ce9b52ede9b674272abb
+Size (actionpack-6.1.5.1.gem) = 226304 bytes
diff --git a/www/ruby-actionview61/distinfo b/www/ruby-actionview61/distinfo
index dad1d4d4753..888557fdaf3 100644
--- a/www/ruby-actionview61/distinfo
+++ b/www/ruby-actionview61/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/03/13 15:11:51 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/04 09:31:42 spz Exp $
-BLAKE2s (actionview-6.1.4.7.gem) = 44be8646b9265431f7e2c92010cd982f590b4600dedde17b80dc5bf2e4f244a1
-SHA512 (actionview-6.1.4.7.gem) = ecd96b954b2746aaf32da6f4f21bae87fd0d8a60c24843b852ba0f623489037f0b84e808bdd5a75d073d5d0e69db9dce0fa400b96091c4e660e9de6dc69fc52f
-Size (actionview-6.1.4.7.gem) = 171520 bytes
+BLAKE2s (actionview-6.1.5.1.gem) = 0b42f114c52b45a33098049853e36a935eca6d90ce84ae756c7d8a8767c140c0
+SHA512 (actionview-6.1.5.1.gem) = 6b3a241aa3d4d15b74c766281a18ee950f0eff97fba013acf648804a73042406a66af9172856c0e3f98715728ca3a067b5ab24068a53541287b8d04a3fdcd747
+Size (actionview-6.1.5.1.gem) = 172032 bytes
diff --git a/www/ruby-rails61/distinfo b/www/ruby-rails61/distinfo
index 7068e8f681e..6b2004eb60e 100644
--- a/www/ruby-rails61/distinfo
+++ b/www/ruby-rails61/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/03/13 15:11:52 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2022/06/04 09:31:42 spz Exp $
-BLAKE2s (rails-6.1.4.7.gem) = 3186b2635736c598025a351b5177960431aa7658d4f95b57a98f46e44ae8a2bb
-SHA512 (rails-6.1.4.7.gem) = 1a2407d6257017246d4c66f999d325bdd73dc655124c4077b56cee4502c3e50b2b9cf399b2dd39d339c3a6fac86e29b22edab2799b76026dee0ca31b85b6fbc5
-Size (rails-6.1.4.7.gem) = 6656 bytes
+BLAKE2s (rails-6.1.5.1.gem) = 6f2be740278671625286b3c7675fa0d623bb5cfc196ab466e5bf7f184c27ef1d
+SHA512 (rails-6.1.5.1.gem) = 852ff9009d6820161458db0df255db96d85584453716f2b67d273558fcdb4ce9ea5c09f46dbb54a10015c327cf660ab04d5c613608beb7fd9e8a61824fc8c6f4
+Size (rails-6.1.5.1.gem) = 6656 bytes