Pullup tickets #6670 and #6671

Pullup ticket #6670 - requested by nia
www/firefox91: security fix www/firefox91-l10n: dependent update Revisions pulled up: - www/firefox91-l10n/Makefile 1.15 - www/firefox91-l10n/distinfo 1.17 - www/firefox91/Makefile 1.25 - www/firefox91/distinfo 1.17 --- Module Name: pkgsrc Committed By: nia Date: Tue Sep 6 15:38:35 UTC 2022 Modified Files: pkgsrc/www/firefox91: Makefile distinfo pkgsrc/www/firefox91-l10n: Makefile distinfo Log Message: firefox91: update to 91.13.0 Security Vulnerabilities fixed in Firefox ESR 91.13 #CVE-2022-38472: Address bar spoofing via XSLT error handling #CVE-2022-38473: Cross-origin XSLT Documents would have inherited the parent's permissions #CVE-2022-38478: Memory safety bugs fixed in Firefox 104, Firefox ESR 102.2, and Firefox ESR 91.13
2022-09-20 18:31:55 +00:00 · 2022-09-20 18:31:28 +00:00 · 2022-09-19 15:24:22 +00:00 · 2022-08-28 14:59:18 +00:00 · 2022-08-28 13:58:00 +00:00 · 2022-08-28 08:15:06 +00:00
132 changed files with 1075 additions and 968 deletions
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.85 2022/04/18 19:10:28 adam Exp $
+# $NetBSD: Makefile,v 1.85.2.1 2022/07/27 19:05:37 spz Exp $

 PKGNAME=	finch-${PIDGIN_VERSION}
-PKGREVISION=	1

 COMMENT=	Multi-protocol console instant messaging client

--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.115 2022/04/18 19:09:41 adam Exp $
+# $NetBSD: Makefile,v 1.115.2.1 2022/07/27 19:05:37 spz Exp $

 PKGNAME=	libpurple-${PIDGIN_VERSION}
-PKGREVISION=	1

 COMMENT=	Plugin-based multi-protocol instant messaging library

--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.55 2022/03/06 07:31:44 nia Exp $
+# $NetBSD: Makefile.common,v 1.55.4.1 2022/07/27 19:05:37 spz Exp $
 #
 # used by chat/finch/Makefile
 # used by chat/libpurple/Makefile
@ -6,7 +6,7 @@
 # used by chat/pidgin-sametime/Makefile
 # used by chat/pidgin-silc/Makefile

-PIDGIN_VERSION=	2.14.8
+PIDGIN_VERSION=	2.14.10
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.55 2022/03/06 07:31:44 nia Exp $
+$NetBSD: distinfo,v 1.55.4.1 2022/07/27 19:05:37 spz Exp $

-BLAKE2s (pidgin-2.14.8.tar.bz2) = d08e480d8f7d87c971a4aa395f534879acf06c92ac8c84f22d779a0956e4ea5f
-SHA512 (pidgin-2.14.8.tar.bz2) = 23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6
-Size (pidgin-2.14.8.tar.bz2) = 8683281 bytes
+BLAKE2s (pidgin-2.14.10.tar.bz2) = 32b2a307ed8ee05216688b0168a225921f4c1aec5369d5cebec8d91b25fdcb25
+SHA512 (pidgin-2.14.10.tar.bz2) = 53241e9f62170fe7a8ea27ac03176d442f8aad4ed16da0033164b0949b00c3d476539b182e761950e7d6c385f22a891524c5f40a9cf8fe543b3003c37693314d
+Size (pidgin-2.14.10.tar.bz2) = 8229328 bytes
 SHA1 (patch-libpurple_plugins_perl_common_Makefile.PL.in) = 4fc1c7cc2df8f4cf179d00fe3bcf5b2ab0c5adbd
--- a/chat/pidgin-sametime/Makefile
+++ b/chat/pidgin-sametime/Makefile
@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2022/04/18 19:10:31 adam Exp $
+# $NetBSD: Makefile,v 1.65.2.1 2022/07/27 19:05:37 spz Exp $

 PKGNAME=	pidgin-sametime-${PIDGIN_VERSION}
-PKGREVISION=	1

 COMMENT=	Lotus Sametime plugin for the Pidgin instant messenger

--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2022/04/18 19:10:31 adam Exp $
+# $NetBSD: Makefile,v 1.68.2.1 2022/07/27 19:05:37 spz Exp $

 PKGNAME=	pidgin-silc-${PIDGIN_VERSION}
-PKGREVISION=	1

 COMMENT=	SILC plugin for the Pidgin instant messenger

--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.96 2022/04/18 19:09:41 adam Exp $
+# $NetBSD: Makefile,v 1.96.2.1 2022/07/27 19:05:37 spz Exp $

 COMMENT=		Multi-protocol GTK instant messaging client
-PKGREVISION=		1

 .include		"../../chat/libpurple/Makefile.common"

--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2021/05/02 10:19:20 nia Exp $
+@comment $NetBSD: PLIST,v 1.26.10.1 2022/07/27 19:05:37 spz Exp $
 bin/pidgin
 include/pidgin/gtkaccount.h
 include/pidgin/gtkblist-theme-loader.h
@ -408,6 +408,7 @@ share/pixmaps/pidgin/emotes/small/excited.png
 share/pixmaps/pidgin/emotes/small/excruciating.png
 share/pixmaps/pidgin/emotes/small/eyeroll.png
 share/pixmaps/pidgin/emotes/small/girl.png
+share/pixmaps/pidgin/emotes/small/glasses-cool.png
 share/pixmaps/pidgin/emotes/small/grumpy.png
 share/pixmaps/pidgin/emotes/small/happy.png
 share/pixmaps/pidgin/emotes/small/hot.png
@ -436,6 +437,7 @@ share/pixmaps/pidgin/emotes/small/question.png
 share/pixmaps/pidgin/emotes/small/restroom.png
 share/pixmaps/pidgin/emotes/small/rose.png
 share/pixmaps/pidgin/emotes/small/sad.png
+share/pixmaps/pidgin/emotes/small/sarcastic.png
 share/pixmaps/pidgin/emotes/small/search.png
 share/pixmaps/pidgin/emotes/small/shame.png
 share/pixmaps/pidgin/emotes/small/shocked.png
--- a/chat/prosody/Makefile
+++ b/chat/prosody/Makefile
@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2022/05/08 21:24:12 khorben Exp $
+# $NetBSD: Makefile,v 1.37.2.1 2022/07/26 19:08:02 spz Exp $

 DISTNAME=		prosody-0.12.0
+PKGREVISION=		2
 CATEGORIES=		chat
 MASTER_SITES=		https://prosody.im/downloads/source/

@ -16,7 +17,7 @@ DEPENDS+=		${LUA_PKGPREFIX}-socket>=2.0:../../net/lua-socket
 DEPENDS+=		${LUA_PKGPREFIX}-unbound-[0-9]*:../../net/lua-unbound

 HAS_CONFIGURE=		yes
-USE_LANGUAGES=		c99
+USE_LANGUAGES=		c
 BUILD_DEFS+=		VARBASE

 LUA_VERSIONS_ACCEPTED=	52 51
@ -53,7 +54,7 @@ SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing default paths
 SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	makefile prosody.cfg.lua.dist
-SUBST_SED.path=		-e 's,$$(CONFIG),$$(DESTDIR)$(EGDIR),g'
+SUBST_SED.path=		-e 's,$$(CONFIG),$${DESTDIR}${EGDIR},g'
 SUBST_VARS.path=	EGDIR PROSODY_DATA PROSODY_LOG PROSODY_RUN

 CONFIGURE_ARGS+=	--cflags=${CFLAGS:Q}
@ -69,6 +70,9 @@ MAKE_ENV.SunOS+=	SOCKET_LIB=-lsocket
 MAKE_FILE=		makefile

 RCD_SCRIPTS=		prosody
+FILES_SUBST+=		PROSODY_RUN=${PROSODY_RUN}
+FILES_SUBST+=		PROSODY_USER=${PROSODY_USER}
+FILES_SUBST+=		PROSODY_GROUP=${PROSODY_GROUP}

 TEST_TARGET=		test

--- a/chat/prosody/files/prosody.sh
+++ b/chat/prosody/files/prosody.sh
@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: prosody.sh,v 1.2 2021/08/29 18:32:29 khorben Exp $
+# $NetBSD: prosody.sh,v 1.2.8.1 2022/07/26 19:08:02 spz Exp $
 #
 # PROVIDE: prosody
 # REQUIRE: DAEMON
@ -13,10 +13,19 @@ name="prosody"
 rcvar=${name}
 ctl_command="@PREFIX@/bin/${name}ctl"
 required_files="@PKG_SYSCONFDIR@/${name}.cfg.lua"
-pidfile="@VARBASE@/run/${name}.pid"
-#start_precmd="ulimit -n 2048"
+pidfile="@PROSODY_RUN@/${name}.pid"
+start_precmd="prosody_precmd"
 extra_commands="reload status"

+prosody_precmd()
+{
+    if [ ! -d @PROSODY_RUN@ ]; then
+        @MKDIR@ -m 0755 @PROSODY_RUN@
+    fi
+    @CHOWN@ @PROSODY_USER@:@PROSODY_GROUP@ @PROSODY_RUN@
+    #ulimit -n 2048
+}
+
 start_cmd="${ctl_command} start"
 stop_cmd="${ctl_command} stop"
 reload_cmd="${ctl_command} reload"
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2022/03/13 17:32:59 nia Exp $
+# $NetBSD: Makefile,v 1.26.4.1 2022/08/28 08:13:40 spz Exp $

 # Before updating, make sure net/samba4 supports the newer version.
-DISTNAME=	ldb-2.4.2
+DISTNAME=	ldb-2.4.4
 CATEGORIES=	databases
 MASTER_SITES=	https://www.samba.org/ftp/ldb/

--- a/databases/ldb/distinfo
+++ b/databases/ldb/distinfo
@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2022/03/07 21:36:19 thor Exp $
+$NetBSD: distinfo,v 1.18.4.1 2022/08/28 08:13:40 spz Exp $

-BLAKE2s (ldb-2.4.2.tar.gz) = 710d6614f1ffcc61735f96fae6495be90b185f0bbd19e8c293650ae73e9dee00
-SHA512 (ldb-2.4.2.tar.gz) = 77705ad284eed9105c9aba0459d2e48cd66ca19b657a55f7513e10281dd2e96540d24d1c8df53adc84109a918900687dc75b635cda05c4e788424ed71b5ff989
-Size (ldb-2.4.2.tar.gz) = 1720169 bytes
+BLAKE2s (ldb-2.4.4.tar.gz) = e9f014779960552b2603b5d02de99abf7474ecc82d0ac8881b5f5155cfae8826
+SHA512 (ldb-2.4.4.tar.gz) = 2e4c762525eee9db40083b21e2a23f9cdfad5d2969cc628b3ea5414f9ec1be2c12d0aa65137cd8d8a5395c0414166ba14fc3dd57d53c533596762d80b9c561f4
+Size (ldb-2.4.4.tar.gz) = 1726595 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 813c639e404e3b301444decae318c702c87f0cc1
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2
--- a/databases/ruby-activerecord52/distinfo
+++ b/databases/ruby-activerecord52/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2022/06/07 14:48:12 taca Exp $
+$NetBSD: distinfo,v 1.14.2.1 2022/07/23 17:05:52 spz Exp $

-BLAKE2s (activerecord-5.2.8.gem) = 424c01dc0d7c4b8e3d8e363fb534bf6de40995d1d4d411b6edad7d1809e83ad0
-SHA512 (activerecord-5.2.8.gem) = e3c4ae2c318a9ac71a7ba2e7fcca69be238cd3433ebe9dde94e67d03d5da1dcdcd06c19aa8b828a8a796680b81cee330b041829fa90418661e7c6e96500afcc7
-Size (activerecord-5.2.8.gem) = 358400 bytes
+BLAKE2s (activerecord-5.2.8.1.gem) = 3bb38557e307386380b2f386eb0a0e131f1ce82030d9d99933f620619387009e
+SHA512 (activerecord-5.2.8.1.gem) = dd0a7b2f2b6cfcc968ca989ecd979a6e8326c2bf6474beb132b0f9e0298177fb916571fb219cf66b32aa20718a6d29cffcba60beee4a2449a2677306d989d49e
+Size (activerecord-5.2.8.1.gem) = 359424 bytes
--- a/databases/ruby-activerecord60/distinfo
+++ b/databases/ruby-activerecord60/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2022/06/07 14:59:21 taca Exp $
+$NetBSD: distinfo,v 1.18.2.1 2022/07/23 19:15:50 spz Exp $

-BLAKE2s (activerecord-6.0.5.gem) = 220722d6730cb0c96b14ac658c84448b433a1ab66e4c681319ca7e8cf7efbd0c
-SHA512 (activerecord-6.0.5.gem) = 645ccf5b96e9cd4e639b559121164aa48069bfcd0db6ebfa11cd9fc2d942eab8ab9b153ee26943f6a9ad8db5b6b6d76a1cd7351779343b4d68d618242a33e6e4
-Size (activerecord-6.0.5.gem) = 410624 bytes
+BLAKE2s (activerecord-6.0.5.1.gem) = b603e374f52f7f7edd05d4285dd67d1ef7bde9296cf2802ec3452f6e211ebb1b
+SHA512 (activerecord-6.0.5.1.gem) = 341e28f0a8834e57224b6b429c30b129098d9e50d669fa61879abd06e5d6fe28a7d5fd11dffcbb8769405bc0c7f4937340633adbb762bb226757e8fed866735a
+Size (activerecord-6.0.5.1.gem) = 411136 bytes
--- a/databases/ruby-activerecord61/distinfo
+++ b/databases/ruby-activerecord61/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2022/06/07 15:05:22 taca Exp $
+$NetBSD: distinfo,v 1.13.2.1 2022/07/23 19:35:07 spz Exp $

-BLAKE2s (activerecord-6.1.6.gem) = ae642639c76640a7fe4ea99909cace7c3b1a09f85729ba667664cd8deeb97f11
-SHA512 (activerecord-6.1.6.gem) = 9982356c9d7edbcecb2eda2f2b956166514b74bbf1d195193948fee69a55b5d50b81e33779d67e21215605167e680dd39e6793ade3c53b3d0aa4b7efe12d0161
-Size (activerecord-6.1.6.gem) = 432128 bytes
+BLAKE2s (activerecord-6.1.6.1.gem) = e299bd566523ce8f763ce69fa90a630a4d6a54eff1beea17c03ee9ef86ad638c
+SHA512 (activerecord-6.1.6.1.gem) = fabe5c4db41ab8aab529e743592634e94e914edb97690a6a3b0cd16e7d31d00d014a1a44ed4248286516f92ee0bbb1d0a0b92026f1016885e4efa25492a4185b
+Size (activerecord-6.1.6.1.gem) = 432640 bytes
--- a/databases/ruby-activerecord70/distinfo
+++ b/databases/ruby-activerecord70/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2022/06/07 15:19:27 taca Exp $
+$NetBSD: distinfo,v 1.6.2.1 2022/07/23 19:40:53 spz Exp $

-BLAKE2s (activerecord-7.0.3.gem) = 59548ccc12044f0b75e889ecdc878b33a5609a25a36bbf3fe740b200af205379
-SHA512 (activerecord-7.0.3.gem) = 266a3957f4c51a11c76b0f7b61ae61a6881d8ef8524d0110bb20dd15e8cd7a0aaed956ce66c37170fba5ad2ce756f3716c950335a5eb87fc3927cbea18eab975
-Size (activerecord-7.0.3.gem) = 474112 bytes
+BLAKE2s (activerecord-7.0.3.1.gem) = 854a94b3af7533b488bec56256236299dce011fcf1fed3a488948afb5f9ffbea
+SHA512 (activerecord-7.0.3.1.gem) = 28460f9e2bb3a9231a9d4f25216400ce93d2ec10d2ad81bad4c7a80cc9f8fcd44e99806197d586bc69a0b5a141b12b243322731ebbb19a59d9c690fede78e3b6
+Size (activerecord-7.0.3.1.gem) = 474624 bytes
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.119 2022/05/09 12:00:16 adam Exp $
+$NetBSD: distinfo,v 1.119.2.1 2022/07/26 19:29:01 spz Exp $

-BLAKE2s (git-2.36.1.tar.xz) = cb270cd6a16e2669772132c0d8b816b449314b790a9eee873432157a2207ac0c
-SHA512 (git-2.36.1.tar.xz) = 459432bd0c1d5a87c828a6fbf6d3473f14bf6b95783b3f27ea4f3af1ba9fd0e712a96a41276a16c6ebeb7ac3583a5f445eedd0a9e19fe160c2c8e309ec58818e
-Size (git-2.36.1.tar.xz) = 7004044 bytes
+BLAKE2s (git-2.37.1.tar.xz) = 5068f0c16d70ccd984f61f1cfdc2f4034b52b5e449d07f8d3bd35449bc744e1a
+SHA512 (git-2.37.1.tar.xz) = 3c9cad6b4757f425ee53996d8d80db2226b246513cbcec9011022e02e4235d7ec38c7c1aada73bb3c9279a91d1aaf8664633356ce1dce847e0d371f702a5b766
+Size (git-2.37.1.tar.xz) = 6980388 bytes
 SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
 SHA1 (patch-Makefile) = e3e07365a22c8612e0f5ff3b7befb2bdd788dfb8
 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.105 2022/05/09 12:00:15 adam Exp $
+# $NetBSD: Makefile.version,v 1.105.2.1 2022/07/26 19:29:02 spz Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile

-GIT_VERSION=	2.36.1
+GIT_VERSION=	2.37.1
--- a/devel/libFoundation/patches/patch-aa
+++ b/devel/libFoundation/patches/patch-aa
@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/04/18 02:27:21 rh Exp $
+$NetBSD: patch-aa,v 1.1 2009/04/18 02:19:23 rh Exp $

--- GNUmakefile.orig	2009-04-18 11:56:31.000000000 +1000
+--- GNUmakefile.orig	2009-04-18 10:49:03.000000000 +1000
 +++ GNUmakefile
@@ -38,7 +38,7 @@ GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
 include $(GNUSTEP_MAKEFILES)/common.make
 include ./Version
 
 -SUBPROJECTS = Foundation Resources examples
-+SUBPROJECTS = examples
+SUBPROJECTS = Foundation Resources
 
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 
--- a/devel/ruby-activejob52/distinfo
+++ b/devel/ruby-activejob52/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2022/06/07 14:48:12 taca Exp $
+$NetBSD: distinfo,v 1.14.2.1 2022/07/23 17:05:52 spz Exp $

-BLAKE2s (activejob-5.2.8.gem) = 95b0a069f29b53525e6f3a6ca996abd6270fff82405a2737ccebafdacbee9434
-SHA512 (activejob-5.2.8.gem) = 5d708317c7fbff448710ac2c7958c01f4d3453a62d12913fc6e28dc4aa55a7914d5f37e2be652e7827cb56cc5d5607dce97e0dbe7f7a7be272cdb848f811223a
-Size (activejob-5.2.8.gem) = 26624 bytes
+BLAKE2s (activejob-5.2.8.1.gem) = 3278bf01bfa97d23ce6453cc2f50d083873d1bbfeaa9e693bfcbfcc98b05db10
+SHA512 (activejob-5.2.8.1.gem) = 9b9d9e87d3799dfe4e01ba6f3f99a545aab77ff56bcd18758acf23837357d8119d6077429dc25c1cf0f51a06fcd72fe8369f924db1a7d473d2c4280d45a8bce9
+Size (activejob-5.2.8.1.gem) = 26624 bytes
--- a/devel/ruby-activejob60/distinfo
+++ b/devel/ruby-activejob60/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2022/06/07 14:59:20 taca Exp $
+$NetBSD: distinfo,v 1.18.2.1 2022/07/23 19:15:50 spz Exp $

-BLAKE2s (activejob-6.0.5.gem) = 76c5f5621d86178dd89227ef3bd2304fef5179b8e9f6bc7dc440f6ac55c14ef7
-SHA512 (activejob-6.0.5.gem) = 0d091110e90d5aa5013f62a64e342dcf05dcbd395bda02824a1f405ca9b51adf9782f7b18ce1e9aadccce9d0b90b5d613b5b26509b79a6490e7f20eebbc11bee
-Size (activejob-6.0.5.gem) = 31744 bytes
+BLAKE2s (activejob-6.0.5.1.gem) = 8c8079bdd7cac84b49786b39bfe58508918a2bb018d679d82ae97e338a5068c6
+SHA512 (activejob-6.0.5.1.gem) = 42227354afccba496f1351f3827bdf35ae24db610f30725a725a237fca4a3c9da7c828e64150ee4ec71d72fc5dcdbe53184eebc70106af7ebc8ad8056e469a5f
+Size (activejob-6.0.5.1.gem) = 31744 bytes
--- a/devel/ruby-activejob61/distinfo
+++ b/devel/ruby-activejob61/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2022/06/07 15:05:22 taca Exp $
+$NetBSD: distinfo,v 1.13.2.1 2022/07/23 19:35:07 spz Exp $

-BLAKE2s (activejob-6.1.6.gem) = f2c27a75302814c8596f85bda13d71b29f876241fff267daf1473b4e4a5483eb
-SHA512 (activejob-6.1.6.gem) = 726256fb8218354e26b5b950486fc14142e7435e0e05d680864aed61533912cc15e81ac06a11ce35ded39c7e6f0f311b23deffc0761fe8e62194a364276a094c
-Size (activejob-6.1.6.gem) = 32768 bytes
+BLAKE2s (activejob-6.1.6.1.gem) = 5a63ad6c738c433d68fbf739e11a688b4a259c3762d4d78c5563a4e802946bd6
+SHA512 (activejob-6.1.6.1.gem) = 706cfd210e075b8e84bb19555ac40335ba68631e754dfc07d4671d842778cb01ff6de896fed093edd216d0ffddd3e999595d60c9970260bcec99d73f1ccff791
+Size (activejob-6.1.6.1.gem) = 32768 bytes
--- a/devel/ruby-activejob70/distinfo
+++ b/devel/ruby-activejob70/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2022/06/07 15:17:13 taca Exp $
+$NetBSD: distinfo,v 1.6.2.1 2022/07/23 19:40:53 spz Exp $

-BLAKE2s (activejob-7.0.3.gem) = 4a06c83f6c6b2c76d805e03a52818699d930ae3b4e64b897eb9e81269f63e67f
-SHA512 (activejob-7.0.3.gem) = 05c1f8d22cf78d99348d418203f837bbe6a932056ad9cf2d992a85109ffa8d1399d49e2be84641fe8f6ae8eda1be189b61d4b1845b0532647015637d0b417983
-Size (activejob-7.0.3.gem) = 33280 bytes
+BLAKE2s (activejob-7.0.3.1.gem) = 3b50837931f9662bb3b009622db793fe2c8951b6c22b0d10255868b97b048032
+SHA512 (activejob-7.0.3.1.gem) = 724dcea780fce091fb3323c64fb4b3bf65d52591c2ca59bd50816c9cbecda7cd4239ba42a2451be47a5aceff39f8482a02ad52637c31a638d2737c79e67e94d1
+Size (activejob-7.0.3.1.gem) = 33280 bytes
--- a/devel/ruby-activemodel52/distinfo
+++ b/devel/ruby-activemodel52/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2022/06/07 14:48:12 taca Exp $
+$NetBSD: distinfo,v 1.14.2.1 2022/07/23 17:05:52 spz Exp $

-BLAKE2s (activemodel-5.2.8.gem) = 4a8767c2ce199393d4100d3c8e50d64b1a449e75fd495b4d7db52eaf71bbda68
-SHA512 (activemodel-5.2.8.gem) = 489bdf4637abf50079d2e21f9054ae27eae9016a559d6ae59fc79c3cbc8bd8767a30fa5b8f190c008ae21be11d7ea08b4e6214c17fe811941c7101f8e73e3720
-Size (activemodel-5.2.8.gem) = 56832 bytes
+BLAKE2s (activemodel-5.2.8.1.gem) = 4106ffec48852c29c4708725be30e49344826df23c1a251355f009a86a3ace80
+SHA512 (activemodel-5.2.8.1.gem) = 87b432d530f058396b0e23ebefe77d7dc888d20d29f7fa9794db3d544a96e6fc1c31b60b8073b5e17ceacf7ebe9bc0790950e1e18de4aaf06d5a247b25f90ad6
+Size (activemodel-5.2.8.1.gem) = 56832 bytes
--- a/devel/ruby-activemodel60/distinfo
+++ b/devel/ruby-activemodel60/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2022/06/07 14:59:20 taca Exp $
+$NetBSD: distinfo,v 1.18.2.1 2022/07/23 19:15:50 spz Exp $

-BLAKE2s (activemodel-6.0.5.gem) = 65df888542fe7fb8a6afe8c2c1da743ae9390a2df6e7c54fe957404f1fbe8dcf
-SHA512 (activemodel-6.0.5.gem) = 9a3b2edacbb04d61875ec9138ec7fc73819addc44c02af07589d5a95932c5dafb9a52a510317b1692821d7fd997ac014586889cd1e1544b46c4806ff4d4e348d
-Size (activemodel-6.0.5.gem) = 58880 bytes
+BLAKE2s (activemodel-6.0.5.1.gem) = dcb8083c2b2dbe2b996c50c293a6075937953f6ac297e2cac2ee07b36883f46e
+SHA512 (activemodel-6.0.5.1.gem) = 64da8065c93a3a1e30b1c7b58e39aa50254ea32a904f31ef10108311906f86b83c5954f1e33ef7f48149fd0c5f745e82433adef6f8e3cbff81bd349af8d153af
+Size (activemodel-6.0.5.1.gem) = 58880 bytes
--- a/devel/ruby-activemodel61/distinfo
+++ b/devel/ruby-activemodel61/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2022/06/07 15:05:22 taca Exp $
+$NetBSD: distinfo,v 1.13.2.1 2022/07/23 19:35:07 spz Exp $

-BLAKE2s (activemodel-6.1.6.gem) = 5adf7226f232bf42e4e29e9b201b6b63835f1cd3016c393952cdb4b688cb36dd
-SHA512 (activemodel-6.1.6.gem) = d0198f53c05a40fe9a641fab0f674c068340cd19a4f9f9d03fe1b0030567ee6dd88dcaf462561dd24b9465c1b695a259bf7d97c654b9537e1d4adfa287ece32e
-Size (activemodel-6.1.6.gem) = 62464 bytes
+BLAKE2s (activemodel-6.1.6.1.gem) = 8ee9754f374ca894280bafedfc421962438fbcebd68f619d787ce7a6fcabf75d
+SHA512 (activemodel-6.1.6.1.gem) = 1369524d0d4fc9193b897e18d4e108e4a5bee183752a57305fb43e63e1648757b4cf8ea98b6afe8a3be6291fbe6ee1e5e2df50beebb576133967a012de95184b
+Size (activemodel-6.1.6.1.gem) = 62464 bytes
--- a/devel/ruby-activemodel70/distinfo
+++ b/devel/ruby-activemodel70/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2022/06/07 15:16:15 taca Exp $
+$NetBSD: distinfo,v 1.6.2.1 2022/07/23 19:40:53 spz Exp $

-BLAKE2s (activemodel-7.0.3.gem) = abc0007d58ea4d502577f4f94e4ea8a27049b9170352d59788f65c8e5b347b4f
-SHA512 (activemodel-7.0.3.gem) = f19a1ea495299a831a46633f6628632f0098762ba85886de8383be8b7824f29ee485025280b359465c60bacf7e1dd1729d48cbe1c5ac30826dbc09148bf96348
-Size (activemodel-7.0.3.gem) = 60928 bytes
+BLAKE2s (activemodel-7.0.3.1.gem) = 5c325bc7a95830367e43c801723fffcfff64f232867bda681816df293d1edf59
+SHA512 (activemodel-7.0.3.1.gem) = 427e19902aa44892197fe85f078b2b79676e87f02a871a107321fed0aa888b2507a0d67230d54ba6b14990f2a22b244dfaa74f8c643f767ad86363c1d602b413
+Size (activemodel-7.0.3.1.gem) = 60928 bytes
--- a/devel/ruby-activestorage52/distinfo
+++ b/devel/ruby-activestorage52/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2022/06/07 14:48:12 taca Exp $
+$NetBSD: distinfo,v 1.14.2.1 2022/07/23 17:05:52 spz Exp $

-BLAKE2s (activestorage-5.2.8.gem) = e1214249012a8d4d8fd48242c7d9c49670c0b83a3cb9938fc6a9edb06631f4ef
-SHA512 (activestorage-5.2.8.gem) = 5511d71aaafe70f272c721e0bb40cedb6f477d2719c3cfe4228aad04c43d1cb7ab7c8f63cbd6c43e64c9247077b6a6ad3969c93fc40ba40a053604d243be32fd
-Size (activestorage-5.2.8.gem) = 46592 bytes
+BLAKE2s (activestorage-5.2.8.1.gem) = ffc66d4d38e49595245d86a2441e97e055d03e17f246dab01ed732b8cb27b3f9
+SHA512 (activestorage-5.2.8.1.gem) = c6fb7ef3f47ed6e37b35cbe5a4a04dab15f391cab25c91224a6e6330e41d6c94787c482143d4064a662fa3fabae95dd53fbd56db7f970ac354961633c510bf26
+Size (activestorage-5.2.8.1.gem) = 46592 bytes
--- a/devel/ruby-activestorage60/distinfo
+++ b/devel/ruby-activestorage60/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2022/06/07 14:59:21 taca Exp $
+$NetBSD: distinfo,v 1.18.2.1 2022/07/23 19:15:51 spz Exp $

-BLAKE2s (activestorage-6.0.5.gem) = d7d952f6a429aecbe71e27067fdee0c0fc2ede3d8587991944b673a6d3a79971
-SHA512 (activestorage-6.0.5.gem) = fb94e60ad337ec3897c9f849391e6ff9c3d12066193117874b38ca30490ca832120bc53cfbaf776a45c15a9f0c638ff4b5e00423a22676262afa61cbcd806405
-Size (activestorage-6.0.5.gem) = 53248 bytes
+BLAKE2s (activestorage-6.0.5.1.gem) = 58bc55c1ce70c396cdefe342323d034cfbaea754656896ccd4cc8930632976bc
+SHA512 (activestorage-6.0.5.1.gem) = bf9904c846d3996217e0097332dabe1b27a5c6f68b6cb7b62d4c29b5260d899a377a73960785ba7545468a3bb7dfc039dd836c12dcd0745c5474adde7b4675c7
+Size (activestorage-6.0.5.1.gem) = 53248 bytes
--- a/devel/ruby-activestorage61/distinfo
+++ b/devel/ruby-activestorage61/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2022/06/07 15:05:22 taca Exp $
+$NetBSD: distinfo,v 1.13.2.1 2022/07/23 19:35:07 spz Exp $

-BLAKE2s (activestorage-6.1.6.gem) = c0e169ace5b5cb032dc006a09bff263e8417fc0a6848c424bb086ce85f79f96b
-SHA512 (activestorage-6.1.6.gem) = b910f2c41590bee291b11da9c3abb3ed5d088ef6407bc1e3da3d7c017956754240094608f19bab5b50f03459f808e2d60dc73a2f75bc2d482fc1f4539a4511f7
-Size (activestorage-6.1.6.gem) = 57856 bytes
+BLAKE2s (activestorage-6.1.6.1.gem) = 398dad15264a3db64376d16350fe08956fd6455df4918d10b50ea35ee59508eb
+SHA512 (activestorage-6.1.6.1.gem) = 59557a7963286fa3bb7c82699906d970ed21e1aa7e9dce0ba240d709f279e1cb922df6797c7147850b5864b2942f6b9c8f1b04ac7a26a4a0d11fade387c97ce6
+Size (activestorage-6.1.6.1.gem) = 57856 bytes
--- a/devel/ruby-activestorage70/distinfo
+++ b/devel/ruby-activestorage70/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2022/06/07 15:20:09 taca Exp $
+$NetBSD: distinfo,v 1.6.2.1 2022/07/23 19:40:53 spz Exp $

-BLAKE2s (activestorage-7.0.3.gem) = eb1d7ea6596c632a732226f109b5835ed397ce62253373a29b3219dd7379e6ea
-SHA512 (activestorage-7.0.3.gem) = 2d516d6906c3a5274374ea56e6f7defba87fd9e91ea923029bdba91206bdc47835150191fa5615a9e54ea897868a5633df6497345cf6e7113546c2cc72542b49
-Size (activestorage-7.0.3.gem) = 65536 bytes
+BLAKE2s (activestorage-7.0.3.1.gem) = 26968078d2692fd4b8e7280994e51684a9d0209131e0b6936e95bb9b90528df1
+SHA512 (activestorage-7.0.3.1.gem) = fce177441c17366d1cc4997d35e7970b619425b6a6d8a537c128aa7e535f19abe3791e500a77e3ed483472922918950a2de8a9c60a6d1ecc83779aec3990b8d7
+Size (activestorage-7.0.3.1.gem) = 65536 bytes
--- a/devel/ruby-activesupport52/distinfo
+++ b/devel/ruby-activesupport52/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2022/06/07 14:48:12 taca Exp $
+$NetBSD: distinfo,v 1.14.2.1 2022/07/23 17:05:52 spz Exp $

-BLAKE2s (activesupport-5.2.8.gem) = 0df0637e6b38f4e82fe146130daaa9ca0db635d0065b459b3ca04d732c9e3dc1
-SHA512 (activesupport-5.2.8.gem) = 979bb2163d592c02b96dc19e20036bd744fb7a961a744296854ab8a0e752de67c06026b94e00ed083f41843921cc508db96d61a247a01cd1c2279789723ad4f7
-Size (activesupport-5.2.8.gem) = 382976 bytes
+BLAKE2s (activesupport-5.2.8.1.gem) = 17e84d1c6a2a5c5727e5aeb2285b89aeadff0e44c13bb56934c269f336df9d22
+SHA512 (activesupport-5.2.8.1.gem) = 48074315729ddc43058c0e7545044a774f69ff7e47600acc92ae1776311550f00e30a6ebe62ca57548fc7e288cd906013fdf3694d86852b6caafeeced973b5ba
+Size (activesupport-5.2.8.1.gem) = 382976 bytes
--- a/devel/ruby-activesupport60/distinfo
+++ b/devel/ruby-activesupport60/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2022/06/07 14:59:20 taca Exp $
+$NetBSD: distinfo,v 1.18.2.1 2022/07/23 19:15:51 spz Exp $

-BLAKE2s (activesupport-6.0.5.gem) = 84cbe5e737842c3fc6439540d41450c0f214568c81ffa531c713e41de3c57194
-SHA512 (activesupport-6.0.5.gem) = 47ce244b44a06b4988f1a0c70aced85f0f2bc700ad0b49aa6df39eeec9bc15138c074cc18d4ca5c01e140e25e7e73a40c742114d38cbd0f9d1a39f89471e9c07
-Size (activesupport-6.0.5.gem) = 215040 bytes
+BLAKE2s (activesupport-6.0.5.1.gem) = 9e90d6e1209a44f3fdc901e2bcb9650965a532fbfcc198bea578f5846682c180
+SHA512 (activesupport-6.0.5.1.gem) = 04d6d6b4ecde1178f34b3bc7b21072bcd898f93b58159e7a47f997de8b1118bc008a9d02fcdee58f4e81f84fd6464761a255882ed4da0c065d4629e17969b467
+Size (activesupport-6.0.5.1.gem) = 215040 bytes
--- a/devel/ruby-activesupport61/distinfo
+++ b/devel/ruby-activesupport61/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2022/06/07 15:05:22 taca Exp $
+$NetBSD: distinfo,v 1.13.2.1 2022/07/23 19:35:07 spz Exp $

-BLAKE2s (activesupport-6.1.6.gem) = 4982993682be86cb9110ab7c98f6e408acad3d40ffbad73ef5178935ec346382
-SHA512 (activesupport-6.1.6.gem) = 786d5707792aeed11cb334b6db0ba487302d968e6d4f82d0ad5c6464e3e78a33a96d6e790b506221f629608eb3edd57c6a9e3c84919147226c42ce38aa619b66
-Size (activesupport-6.1.6.gem) = 220672 bytes
+BLAKE2s (activesupport-6.1.6.1.gem) = 2d429a1e9dbb41892f13e72fc83c1089721caf654d8febf118f556771431d650
+SHA512 (activesupport-6.1.6.1.gem) = d1bd130f8cb93cc353d216f6ed7a3ba6f9a6ef82f702bbfd718ce16f610f0481453c510205970669e52b9e3cd6abf9ae50a904ce84362f1169cfd2935caedde7
+Size (activesupport-6.1.6.1.gem) = 220672 bytes
--- a/devel/ruby-activesupport70/distinfo
+++ b/devel/ruby-activesupport70/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2022/06/07 15:15:29 taca Exp $
+$NetBSD: distinfo,v 1.6.2.1 2022/07/23 19:40:53 spz Exp $

-BLAKE2s (activesupport-7.0.3.gem) = e345bece8c29387d95d8e521ad43ffffd010fff62d9183a88ceaecc800c71dbc
-SHA512 (activesupport-7.0.3.gem) = 5d97e6731569bdfbb32a6e5ae2c23152d034008decb71775a9374713b53fcea414b3b89a48eb254f9eb26e2f9d2067d26821a64303cf2a37b3a2701c140e89ec
-Size (activesupport-7.0.3.gem) = 223232 bytes
+BLAKE2s (activesupport-7.0.3.1.gem) = bc6149056a7b6c9944721c067748009e6e64e02e09eec3d770de11c0bd9adbff
+SHA512 (activesupport-7.0.3.1.gem) = 2670c6f7aa9bcfda448a72c7d67869fec19e4d6f8c40aae9955d4ae542753feda1d78b66ff774201787b8c73e942d9a3caae3acadf2a91b4196923232d5f8655
+Size (activesupport-7.0.3.1.gem) = 223232 bytes
--- a/devel/ruby-railties52/Makefile
+++ b/devel/ruby-railties52/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/06/07 14:48:13 taca Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2022/07/23 17:05:52 spz Exp $

 DISTNAME=	railties-${RAILS_VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-railties${RUBY_RAILS}-${RAILS_VERSION}
@ -20,14 +20,12 @@ RUBY_RAILS_ACCEPTED=	52
 RUBY_RAILS_STRICT_DEP=	yes
 RUBYGEM_OPTIONS+=	--format-executable
 OVERRIDE_GEMSPEC+=	:executables rails=rails${RUBY_RAILS} \
-			:files exe/rails=exe/rails${RUBY_RAILS} \
-			:files lib/rails/.DS_Store=
+			:files exe/rails=exe/rails${RUBY_RAILS}

 pre-configure:
 	${TEST} -f ${WRKSRC}/exe/rails${RUBY_RAILS} || \
 		${MV} ${WRKSRC}/exe/rails ${WRKSRC}/exe/rails${RUBY_RAILS}
 	${CHMOD} ${BINMODE} ${WRKSRC}/exe/rails${RUBY_RAILS}
-	${RM} ${WRKSRC}/lib/rails/.DS_Store

 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/devel/ruby-railties52/distinfo
+++ b/devel/ruby-railties52/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2022/06/07 14:48:13 taca Exp $
+$NetBSD: distinfo,v 1.14.2.1 2022/07/23 17:05:52 spz Exp $

-BLAKE2s (railties-5.2.8.gem) = 8a28e92d4fd905db207e09ce7f8f7ea9c311f04840fdb10ebd8aa9bec355ae3b
-SHA512 (railties-5.2.8.gem) = c6d3b7ef1294c99301ce75045e25617ce14b42c0b29e855967f9ff9bba1d331212113e10207934f7470f4fbd327026627d4edf60aa5e3f189f82c594f6613359
-Size (railties-5.2.8.gem) = 237056 bytes
+BLAKE2s (railties-5.2.8.1.gem) = e0d2517338cb14d7a3db10916584bc973d978324a042615552028239e2cf9548
+SHA512 (railties-5.2.8.1.gem) = 2cd40d0a967c85e4e908e820aed8bdee42fa85dcf8bd877e5ced609a072936e269640853f6eb2135c6a214b0cae9d01212a5a94da36935ac6ce500acfd7c8fe8
+Size (railties-5.2.8.1.gem) = 236544 bytes
--- a/devel/ruby-railties60/Makefile
+++ b/devel/ruby-railties60/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/06/07 14:59:21 taca Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2022/07/23 19:15:51 spz Exp $

 DISTNAME=	railties-${RAILS_VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-railties${RUBY_RAILS}-${RAILS_VERSION}
@ -20,14 +20,12 @@ RUBY_RAILS_ACCEPTED=	60
 RUBY_RAILS_STRICT_DEP=	yes
 RUBYGEM_OPTIONS+=	--format-executable
 OVERRIDE_GEMSPEC+=	:executables rails=rails${RUBY_RAILS} \
-			:files exe/rails=exe/rails${RUBY_RAILS} \
-			:files lib/rails/.DS_Store=
+			:files exe/rails=exe/rails${RUBY_RAILS}

 pre-configure:
 	${TEST} -f ${WRKSRC}/exe/rails${RUBY_RAILS} || \
 		${MV} ${WRKSRC}/exe/rails ${WRKSRC}/exe/rails${RUBY_RAILS}
 	${CHMOD} ${BINMODE} ${WRKSRC}/exe/rails${RUBY_RAILS}
-	${RM} ${WRKSRC}/lib/rails/.DS_Store

 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/devel/ruby-railties60/distinfo
+++ b/devel/ruby-railties60/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2022/06/07 14:59:21 taca Exp $
+$NetBSD: distinfo,v 1.18.2.1 2022/07/23 19:15:51 spz Exp $

-BLAKE2s (railties-6.0.5.gem) = 5fd092c8157f89a5c58804e490400b2dc5bf19fbc9444d771230d9bcbf062b35
-SHA512 (railties-6.0.5.gem) = f95430e2c2e8c911c17b1270787f50006e54db401dfe5dc63da6b805572f493c56c4c0ff5c22abf17237758c225b69501bddfd83b5689e3e90cf815e982d7e86
-Size (railties-6.0.5.gem) = 456192 bytes
+BLAKE2s (railties-6.0.5.1.gem) = 95ded97ec3d7e3e906adb4272eb85420b661aa8aaaa9afd7b981fbd980a679e9
+SHA512 (railties-6.0.5.1.gem) = d2215ad9101441a7f664a93b4f9553bf32bd1e7fc239f561438dbe137e74d369b1c89703aa8010671dbd9a60969c3d8f7e61ad9984dc7a56a4d4b5e450bdffb9
+Size (railties-6.0.5.1.gem) = 455680 bytes
--- a/devel/ruby-railties61/Makefile
+++ b/devel/ruby-railties61/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/06/07 15:05:23 taca Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2022/07/23 19:35:08 spz Exp $

 DISTNAME=	railties-${RAILS_VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-railties${RUBY_RAILS}-${RAILS_VERSION}
@ -19,14 +19,12 @@ RUBY_RAILS_ACCEPTED=	61
 RUBY_RAILS_STRICT_DEP=	yes
 RUBYGEM_OPTIONS+=	--format-executable
 OVERRIDE_GEMSPEC+=	:executables rails=rails${RUBY_RAILS} \
-			:files exe/rails=exe/rails${RUBY_RAILS} \
-			:files lib/rails/.DS_Store=
+			:files exe/rails=exe/rails${RUBY_RAILS}

 pre-configure:
 	${TEST} -f ${WRKSRC}/exe/rails${RUBY_RAILS} || \
 		${MV} ${WRKSRC}/exe/rails ${WRKSRC}/exe/rails${RUBY_RAILS}
 	${CHMOD} ${BINMODE} ${WRKSRC}/exe/rails${RUBY_RAILS}
-	${RM} ${WRKSRC}/lib/rails/.DS_Store

 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/devel/ruby-railties61/distinfo
+++ b/devel/ruby-railties61/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2022/06/07 15:05:23 taca Exp $
+$NetBSD: distinfo,v 1.13.2.1 2022/07/23 19:35:08 spz Exp $

-BLAKE2s (railties-6.1.6.gem) = ed8c22a93153709c1fdcc695504d2a8e91138eb82bbaf9391bb894d9b55f472a
-SHA512 (railties-6.1.6.gem) = 5975bfd036c6a512d5bc5fbab447392fdd4933d3ef16c8c43c51b2024143c3cae222f381730c47deabd22894cf2fea2e92c7f3e64e3f660a99d445a322778a44
-Size (railties-6.1.6.gem) = 457728 bytes
+BLAKE2s (railties-6.1.6.1.gem) = 63f03d87ef7d86e48825717dbf6c05e597889354d95c33890507cf3b3f55a0bc
+SHA512 (railties-6.1.6.1.gem) = 66264504f850cfee022fd444cfd78fd45e05d6323866370d07cf62e119342cc170f6b6f9028e40b747dde2b64225c4d01ad1be5d8d1a990c6c51022cb73bc778
+Size (railties-6.1.6.1.gem) = 457216 bytes
--- a/devel/ruby-railties70/Makefile
+++ b/devel/ruby-railties70/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/06/07 15:22:14 taca Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2022/07/23 19:40:54 spz Exp $

 DISTNAME=	railties-${RAILS_VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-railties${RUBY_RAILS}-${RAILS_VERSION}
@ -20,8 +20,7 @@ RUBY_RAILS_ACCEPTED=	70
 RUBY_RAILS_STRICT_DEP=	yes
 RUBYGEM_OPTIONS+=	--format-executable
 OVERRIDE_GEMSPEC+=	:executables rails=rails${RUBY_RAILS} \
-			:files exe/rails=exe/rails${RUBY_RAILS} \
-			:files lib/rails/.DS_Store=
+			:files exe/rails=exe/rails${RUBY_RAILS}

 RUBY_VERSIONS_INCOMPATIBLE=	26

--- a/devel/ruby-railties70/distinfo
+++ b/devel/ruby-railties70/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2022/06/07 15:22:14 taca Exp $
+$NetBSD: distinfo,v 1.6.2.1 2022/07/23 19:40:54 spz Exp $

-BLAKE2s (railties-7.0.3.gem) = 3a010031e7594d309a6bfeef2012eb9d9c06d2aba434ac66b9dd9a57ac02abb6
-SHA512 (railties-7.0.3.gem) = dcaad47d71785bcf418642b114de30e83b9f54d818387762cb856c07bb942b3e1c49c7056722ec81ffec3d44f96d35b2b75e4e27daf7a5b152361e9d9ff8eaee
-Size (railties-7.0.3.gem) = 160256 bytes
+BLAKE2s (railties-7.0.3.1.gem) = df3938eb1acb05e16f5ebb473e1158629a7d0e3de190b5db361faed34977e7cd
+SHA512 (railties-7.0.3.1.gem) = eb871ce9d247b1bbe540237d98032fe0e1847ee5c3760f161dc5899586fcb6d2731bf21b36e54cebe760254c494080e0f0b635e4510ea3646ebadd40e807bc2f
+Size (railties-7.0.3.1.gem) = 159744 bytes
--- a/doc/CHANGES-2022
+++ b/doc/CHANGES-2022
@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2022,v 1.3120 2022/06/27 07:50:24 wiz Exp $
+$NetBSD: CHANGES-2022,v 1.3120.2.2 2022/07/21 18:58:08 gdt Exp $

 Changes to the packages collection and infrastructure in 2022:

--- a/doc/CHANGES-pkgsrc-2022Q2
+++ b/doc/CHANGES-pkgsrc-2022Q2
@ -0,0 +1,138 @@
+$NetBSD: CHANGES-pkgsrc-2022Q2,v 1.1.2.8 2022/09/20 18:31:55 bsiegert Exp $
+
+Changes to packages and infrastructure on the pkgsrc-2022Q2 branch:
+
+Pullup ticket #6647 - requested by khorben
+lang/python39: build fix
+lang/python310: build fix
+
+Pullup ticket #6648 - requested by nia
+x11/libXft: NetBSD 8 build fix
+
+Pullup ticket #6650 - requested by khorben
+lang/nodejs14: security update
+
+Pullup ticket #6651 - requested by khorben
+lang/nodejs16: security update
+
+Pullup ticket #6652 - requested by khorben
+lang/nodejs: security update
+
+Pullup ticket #6653 - requested by taca
+databases/ruby-activerecord52: security update
+devel/ruby-activejob52: security update
+devel/ruby-activemodel52: security update
+devel/ruby-activestorage52: security update
+devel/ruby-activesupport52: security update
+devel/ruby-railties52: security update
+mail/ruby-actionmailer52: security update
+www/ruby-actioncable52: security update
+www/ruby-actionpack52: security update
+www/ruby-actionview52: security update
+www/ruby-rails52: security update
+
+Pullup ticket #6654 - requested by taca
+databases/ruby-activerecord60: security update
+devel/ruby-activejob60: security update
+devel/ruby-activemodel60: security update
+devel/ruby-activestorage60: security update
+devel/ruby-activesupport60: security update
+devel/ruby-railties60: security update
+mail/ruby-actionmailbox60: security update
+mail/ruby-actionmailer60: security update
+textproc/ruby-actiontext60: security update
+www/ruby-actioncable60: security update
+www/ruby-actionpack60: security update
+www/ruby-actionview60: security update
+www/ruby-rails60: security update
+
+Pullup ticket #6655 - 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
+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
+
+Pullup ticket #6656 - requested by taca
+databases/ruby-activerecord70: security update
+devel/ruby-activejob70: security update
+devel/ruby-activemodel70: security update
+devel/ruby-activestorage70: security update
+devel/ruby-activesupport70: security update
+devel/ruby-railties70: security update
+mail/ruby-actionmailbox70: security update
+mail/ruby-actionmailer70: security update
+textproc/ruby-actiontext70: security update
+www/ruby-actioncable70: security update
+www/ruby-actionpack70: security update
+www/ruby-actionview70: security update
+www/ruby-rails70: security update
+
+Pullup ticket #6649 - requested by khorben
+chat/prosody: integration fix
+
+Pullup ticket #6657 - requested by taca
+devel/git: security update
+devel/git-base: security update
+devel/git-docs: security update
+www/gitweb: security update
+
+Pullup ticket #6658 - requested by nia
+www/firefox91: security update
+www/firefox91-l10n: dependency update
+
+Pullup ticket #6659 - requested by khorben
+chat/libpurple: security update
+chat/finch: security update
+chat/pidgin: security update
+chat/pidgin-sametime: security update
+chat/pidgin-silc: security update
+
+Pullup ticket #6660 - requested by khorben
+editors/vim-gtk2: security update
+editors/vim-gtk3: security update
+editors/vim-motif: security update
+editors/vim-share: security update
+editors/vim-xaw: security update
+
+Pullup ticket #6661 - requested by taca
+time/ruby-tzinfo1: security update
+
+Pullup ticket #6662 - requested by taca
+www/drupal7: security update
+
+Pullup ticket #6663 - requested by taca
+www/drupal9: security update
+
+Pullup ticket #6665 - requested by khorben
+net/rsync: security update
+
+Pullup ticket #6666 - requested by khorben
+net/unbound: security update
+
+Pullup ticket #6667 - requested by khorben
+security/openssl: security update
+
+Pullup tickets #6664 #6669 - requested by taca
+net/samba4: security update
+databases/ldb: dependency update
+
+Pullup ticket #6668 - requested by khorben
+lang/openjdk8: security update
+lang/openjdk11: security update
+
+Pullup ticket #6671 - requested by gutteridge
+textproc/libxslt: security fix
+
+Pullup ticket #6670 - requested by nia
+www/firefox91: security fix
+www/firefox91-l10n: dependent update
+
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.96 2022/04/18 19:10:59 adam Exp $
+# $NetBSD: Makefile,v 1.96.2.1 2022/08/27 15:35:47 spz Exp $

 PKGNAME=	vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=	10

 COMMENT=	Vim editor (vi clone) with X11 GTK2 GUI

--- a/editors/vim-gtk3/Makefile
+++ b/editors/vim-gtk3/Makefile
@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2021/12/08 16:04:13 adam Exp $
+# $NetBSD: Makefile,v 1.23.6.1 2022/08/27 15:35:47 spz Exp $

 PKGNAME=	vim-gtk3-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=	5

 COMMENT=	Vim editor (vi clone) with X11 GTK3 GUI

--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2021/12/01 21:36:59 wiz Exp $
+# $NetBSD: Makefile,v 1.41.6.1 2022/08/27 15:35:47 spz Exp $

 PKGNAME=		vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		1

 COMMENT=		Vim editor (vi clone) with X11 Motif GUI

--- a/editors/vim-share/PLIST
+++ b/editors/vim-share/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.60 2022/04/09 15:22:20 morr Exp $
+@comment $NetBSD: PLIST,v 1.60.2.1 2022/08/27 15:35:47 spz Exp $
 bin/xxd
 man/man1/evim.1
 man/man1/vim.1
@ -16,6 +16,7 @@ share/vim/${VIM_SUBDIR}/autoload/contextcomplete.vim
 share/vim/${VIM_SUBDIR}/autoload/csscomplete.vim
 share/vim/${VIM_SUBDIR}/autoload/decada.vim
 share/vim/${VIM_SUBDIR}/autoload/dist/ft.vim
+share/vim/${VIM_SUBDIR}/autoload/dist/man.vim
 share/vim/${VIM_SUBDIR}/autoload/dist/script.vim
 share/vim/${VIM_SUBDIR}/autoload/freebasic.vim
 share/vim/${VIM_SUBDIR}/autoload/getscript.vim
@ -121,6 +122,7 @@ share/vim/${VIM_SUBDIR}/compiler/go.vim
 share/vim/${VIM_SUBDIR}/compiler/haml.vim
 share/vim/${VIM_SUBDIR}/compiler/hp_acc.vim
 share/vim/${VIM_SUBDIR}/compiler/icc.vim
+share/vim/${VIM_SUBDIR}/compiler/icon.vim
 share/vim/${VIM_SUBDIR}/compiler/ifort.vim
 share/vim/${VIM_SUBDIR}/compiler/intel.vim
 share/vim/${VIM_SUBDIR}/compiler/irix5_c.vim
@ -143,7 +145,9 @@ share/vim/${VIM_SUBDIR}/compiler/ocaml.vim
 share/vim/${VIM_SUBDIR}/compiler/onsgmls.vim
 share/vim/${VIM_SUBDIR}/compiler/pbx.vim
 share/vim/${VIM_SUBDIR}/compiler/perl.vim
+share/vim/${VIM_SUBDIR}/compiler/perlcritic.vim
 share/vim/${VIM_SUBDIR}/compiler/php.vim
+share/vim/${VIM_SUBDIR}/compiler/podchecker.vim
 share/vim/${VIM_SUBDIR}/compiler/powershell.vim
 share/vim/${VIM_SUBDIR}/compiler/pylint.vim
 share/vim/${VIM_SUBDIR}/compiler/pyunit.vim
@ -310,7 +314,9 @@ share/vim/${VIM_SUBDIR}/doc/usr_42.txt
 share/vim/${VIM_SUBDIR}/doc/usr_43.txt
 share/vim/${VIM_SUBDIR}/doc/usr_44.txt
 share/vim/${VIM_SUBDIR}/doc/usr_45.txt
-share/vim/${VIM_SUBDIR}/doc/usr_46.txt
+share/vim/${VIM_SUBDIR}/doc/usr_50.txt
+share/vim/${VIM_SUBDIR}/doc/usr_51.txt
+share/vim/${VIM_SUBDIR}/doc/usr_52.txt
 share/vim/${VIM_SUBDIR}/doc/usr_90.txt
 share/vim/${VIM_SUBDIR}/doc/usr_toc.txt
 share/vim/${VIM_SUBDIR}/doc/various.txt
@ -363,6 +369,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/cmake.vim
 share/vim/${VIM_SUBDIR}/ftplugin/cobol.vim
 share/vim/${VIM_SUBDIR}/ftplugin/conf.vim
 share/vim/${VIM_SUBDIR}/ftplugin/config.vim
+share/vim/${VIM_SUBDIR}/ftplugin/confini.vim
 share/vim/${VIM_SUBDIR}/ftplugin/context.vim
 share/vim/${VIM_SUBDIR}/ftplugin/cpp.vim
 share/vim/${VIM_SUBDIR}/ftplugin/crm.vim
@ -388,11 +395,13 @@ share/vim/${VIM_SUBDIR}/ftplugin/dtrace.vim
 share/vim/${VIM_SUBDIR}/ftplugin/dune.vim
 share/vim/${VIM_SUBDIR}/ftplugin/eiffel.vim
 share/vim/${VIM_SUBDIR}/ftplugin/elinks.vim
+share/vim/${VIM_SUBDIR}/ftplugin/elixir.vim
 share/vim/${VIM_SUBDIR}/ftplugin/elm.vim
 share/vim/${VIM_SUBDIR}/ftplugin/erlang.vim
 share/vim/${VIM_SUBDIR}/ftplugin/eruby.vim
 share/vim/${VIM_SUBDIR}/ftplugin/eterm.vim
 share/vim/${VIM_SUBDIR}/ftplugin/falcon.vim
+share/vim/${VIM_SUBDIR}/ftplugin/fennel.vim
 share/vim/${VIM_SUBDIR}/ftplugin/fetchmail.vim
 share/vim/${VIM_SUBDIR}/ftplugin/flexwiki.vim
 share/vim/${VIM_SUBDIR}/ftplugin/fortran.vim
@ -423,6 +432,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/hostsaccess.vim
 share/vim/${VIM_SUBDIR}/ftplugin/html.vim
 share/vim/${VIM_SUBDIR}/ftplugin/htmldjango.vim
 share/vim/${VIM_SUBDIR}/ftplugin/i3config.vim
+share/vim/${VIM_SUBDIR}/ftplugin/icon.vim
 share/vim/${VIM_SUBDIR}/ftplugin/indent.vim
 share/vim/${VIM_SUBDIR}/ftplugin/initex.vim
 share/vim/${VIM_SUBDIR}/ftplugin/ishd.vim
@ -493,6 +503,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/perl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/php.vim
 share/vim/${VIM_SUBDIR}/ftplugin/pinfo.vim
 share/vim/${VIM_SUBDIR}/ftplugin/plaintex.vim
+share/vim/${VIM_SUBDIR}/ftplugin/pod.vim
 share/vim/${VIM_SUBDIR}/ftplugin/poke.vim
 share/vim/${VIM_SUBDIR}/ftplugin/postscr.vim
 share/vim/${VIM_SUBDIR}/ftplugin/procmail.vim
@ -549,6 +560,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/swiftgyb.vim
 share/vim/${VIM_SUBDIR}/ftplugin/sysctl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/systemd.vim
 share/vim/${VIM_SUBDIR}/ftplugin/systemverilog.vim
+share/vim/${VIM_SUBDIR}/ftplugin/tap.vim
 share/vim/${VIM_SUBDIR}/ftplugin/tcl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/tcsh.vim
 share/vim/${VIM_SUBDIR}/ftplugin/terminfo.vim
@ -571,6 +583,8 @@ share/vim/${VIM_SUBDIR}/ftplugin/vhdl.vim
 share/vim/${VIM_SUBDIR}/ftplugin/vim.vim
 share/vim/${VIM_SUBDIR}/ftplugin/vroom.vim
 share/vim/${VIM_SUBDIR}/ftplugin/wast.vim
+share/vim/${VIM_SUBDIR}/ftplugin/wget.vim
+share/vim/${VIM_SUBDIR}/ftplugin/wget2.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xdefaults.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xf86conf.vim
 share/vim/${VIM_SUBDIR}/ftplugin/xhtml.vim
@ -585,6 +599,7 @@ share/vim/${VIM_SUBDIR}/ftplugin/zimbu.vim
 share/vim/${VIM_SUBDIR}/ftplugin/zsh.vim
 share/vim/${VIM_SUBDIR}/ftplugof.vim
 share/vim/${VIM_SUBDIR}/gvimrc_example.vim
+share/vim/${VIM_SUBDIR}/import/dist/vimhelp.vim
 share/vim/${VIM_SUBDIR}/indent.vim
 share/vim/${VIM_SUBDIR}/indent/README.txt
 share/vim/${VIM_SUBDIR}/indent/aap.vim
@ -627,6 +642,7 @@ share/vim/${VIM_SUBDIR}/indent/erlang.vim
 share/vim/${VIM_SUBDIR}/indent/eruby.vim
 share/vim/${VIM_SUBDIR}/indent/eterm.vim
 share/vim/${VIM_SUBDIR}/indent/falcon.vim
+share/vim/${VIM_SUBDIR}/indent/fennel.vim
 share/vim/${VIM_SUBDIR}/indent/fortran.vim
 share/vim/${VIM_SUBDIR}/indent/framescript.vim
 share/vim/${VIM_SUBDIR}/indent/freebasic.vim
@ -648,6 +664,7 @@ share/vim/${VIM_SUBDIR}/indent/json.vim
 share/vim/${VIM_SUBDIR}/indent/jsonc.vim
 share/vim/${VIM_SUBDIR}/indent/jsp.vim
 share/vim/${VIM_SUBDIR}/indent/julia.vim
+share/vim/${VIM_SUBDIR}/indent/krl.vim
 share/vim/${VIM_SUBDIR}/indent/ld.vim
 share/vim/${VIM_SUBDIR}/indent/less.vim
 share/vim/${VIM_SUBDIR}/indent/lifelines.vim
@ -700,7 +717,6 @@ share/vim/${VIM_SUBDIR}/indent/sml.vim
 share/vim/${VIM_SUBDIR}/indent/sql.vim
 share/vim/${VIM_SUBDIR}/indent/sqlanywhere.vim
 share/vim/${VIM_SUBDIR}/indent/sshconfig.vim
-share/vim/${VIM_SUBDIR}/indent/systemd.vim
 share/vim/${VIM_SUBDIR}/indent/systemverilog.vim
 share/vim/${VIM_SUBDIR}/indent/tcl.vim
 share/vim/${VIM_SUBDIR}/indent/tcsh.vim
@ -921,6 +937,7 @@ share/vim/${VIM_SUBDIR}/syntax/colortest.vim
 share/vim/${VIM_SUBDIR}/syntax/conaryrecipe.vim
 share/vim/${VIM_SUBDIR}/syntax/conf.vim
 share/vim/${VIM_SUBDIR}/syntax/config.vim
+share/vim/${VIM_SUBDIR}/syntax/confini.vim
 share/vim/${VIM_SUBDIR}/syntax/context.vim
 share/vim/${VIM_SUBDIR}/syntax/cpp.vim
 share/vim/${VIM_SUBDIR}/syntax/crm.vim
@ -1104,6 +1121,7 @@ share/vim/${VIM_SUBDIR}/syntax/julia.vim
 share/vim/${VIM_SUBDIR}/syntax/kconfig.vim
 share/vim/${VIM_SUBDIR}/syntax/kivy.vim
 share/vim/${VIM_SUBDIR}/syntax/kix.vim
+share/vim/${VIM_SUBDIR}/syntax/krl.vim
 share/vim/${VIM_SUBDIR}/syntax/kscript.vim
 share/vim/${VIM_SUBDIR}/syntax/kwt.vim
 share/vim/${VIM_SUBDIR}/syntax/lace.vim
@ -1206,6 +1224,7 @@ share/vim/${VIM_SUBDIR}/syntax/occam.vim
 share/vim/${VIM_SUBDIR}/syntax/omnimark.vim
 share/vim/${VIM_SUBDIR}/syntax/opam.vim
 share/vim/${VIM_SUBDIR}/syntax/openroad.vim
+share/vim/${VIM_SUBDIR}/syntax/openscad.vim
 share/vim/${VIM_SUBDIR}/syntax/opl.vim
 share/vim/${VIM_SUBDIR}/syntax/ora.vim
 share/vim/${VIM_SUBDIR}/syntax/pamconf.vim
@ -1450,6 +1469,7 @@ share/vim/${VIM_SUBDIR}/syntax/wdiff.vim
 share/vim/${VIM_SUBDIR}/syntax/web.vim
 share/vim/${VIM_SUBDIR}/syntax/webmacro.vim
 share/vim/${VIM_SUBDIR}/syntax/wget.vim
+share/vim/${VIM_SUBDIR}/syntax/wget2.vim
 share/vim/${VIM_SUBDIR}/syntax/whitespace.vim
 share/vim/${VIM_SUBDIR}/syntax/winbatch.vim
 share/vim/${VIM_SUBDIR}/syntax/wml.vim
--- a/editors/vim-share/distinfo
+++ b/editors/vim-share/distinfo
@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.198 2022/04/09 15:22:20 morr Exp $
+$NetBSD: distinfo,v 1.198.2.1 2022/08/27 15:35:48 spz Exp $

-BLAKE2s (vim-8.2.4721.tar.gz) = c7f8d7e7d10281b871fd271cef6fd07f41892b82fdae184f60828f62606fa97a
-SHA512 (vim-8.2.4721.tar.gz) = 32e2f0db3e49e43e7afd37d316b067f8649c340f03f585e77cd5f973399aaca8aba413d95c71f446ba28c34366f5746a86e13c94eca0dbd68a79e37dff2fbb26
-Size (vim-8.2.4721.tar.gz) = 16276522 bytes
+BLAKE2s (vim-8.2.5172.tar.gz) = 4a41ce002a058f8344abb47e3fc54f9e65e5a39ea83c46cd3a2b6b0e353f72de
+SHA512 (vim-8.2.5172.tar.gz) = d69fc53bf2fa93896a1050004c18aa1b53449d3aff8514f5d3f37d475b46967607ab1ddbfd145e234b5abac337f90e1ac48d65a3cfa81b4c763a3f76cd3402d4
+Size (vim-8.2.5172.tar.gz) = 16657819 bytes
 SHA1 (patch-Makefile) = eb6c93fb6a3b4364a331d574d94dde9107c8da0b
 SHA1 (patch-auto_configure) = 6517ff23cb337f2fb3874f818d5a50861942aca9
 SHA1 (patch-configure) = 4514af45a71309dabfecb8aae019fdc2e36e45b6
--- a/editors/vim-share/version.mk
+++ b/editors/vim-share/version.mk
@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.137 2022/04/09 15:22:20 morr Exp $
+# $NetBSD: version.mk,v 1.137.2.1 2022/08/27 15:35:48 spz Exp $

 VIM_VERSION=		8.2
-VIM_PATCHLEVEL=		4721
+VIM_PATCHLEVEL=		5172
 # Changelog: see http://ftp.vim.org/pub/vim/patches/8.2/
 VIM_SUBDIR=		vim82

--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2021/12/01 21:36:59 wiz Exp $
+# $NetBSD: Makefile,v 1.64.6.1 2022/08/27 15:35:48 spz Exp $

 PKGNAME=		vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		1
 COMMENT=		Vim editor (vi clone) with X11 Athena GUI

 .include		"../../editors/vim-share/Makefile.common"
--- a/lang/nodejs/Makefile
+++ b/lang/nodejs/Makefile
@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.236 2022/06/17 08:02:48 adam Exp $
+# $NetBSD: Makefile,v 1.236.2.1 2022/07/23 16:54:32 spz Exp $

-DISTNAME=	node-v18.4.0
+DISTNAME=	node-v18.5.0
 EXTRACT_SUFX=	.tar.xz

 USE_LANGUAGES=	c gnu++17
--- a/lang/nodejs/distinfo
+++ b/lang/nodejs/distinfo
@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.216 2022/06/17 08:02:48 adam Exp $
+$NetBSD: distinfo,v 1.216.2.1 2022/07/23 16:54:32 spz Exp $

-BLAKE2s (node-v18.4.0.tar.xz) = ec9a1395aab424f851096c46a708b8c568b7f7c78c17738bf08a80016efff339
-SHA512 (node-v18.4.0.tar.xz) = c00d90cf5cfa8cd5629ed0b7810c436c962e50bd78313789457fd4003900808a190769db9d41e9a22186c6d2cda232bd362d432089eb8990913f7786140e2813
-Size (node-v18.4.0.tar.xz) = 37109064 bytes
+BLAKE2s (node-v18.5.0.tar.xz) = 5e0e51204ffde2a264afee3bf9d7d1d808edb888230b781db4c42221ec6b0365
+SHA512 (node-v18.5.0.tar.xz) = 7ad5654f7c7ff9236c2bbd37cb40afb0624d1fbdf7e38d646a2ce1fc96c8a18cdea844b324464b30e577aae675fa43596f65ee3c523efc73394b5d3b514bf067
+Size (node-v18.5.0.tar.xz) = 37112412 bytes
 SHA1 (patch-common.gypi) = 80f3645498853b9939167d152365b4fa49528b70
 SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32
 SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3
--- a/lang/nodejs14/Makefile
+++ b/lang/nodejs14/Makefile
@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2022/06/01 20:08:14 adam Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2022/07/23 11:39:51 spz Exp $

-DISTNAME=	node-v14.19.3
+DISTNAME=	node-v14.20.0
 EXTRACT_SUFX=	.tar.xz

 USE_LANGUAGES=	c gnu++14
--- a/lang/nodejs14/distinfo
+++ b/lang/nodejs14/distinfo
@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2022/06/01 20:08:14 adam Exp $
+$NetBSD: distinfo,v 1.2.2.1 2022/07/23 11:39:51 spz Exp $

-BLAKE2s (node-v14.19.3.tar.xz) = 2e60610b507fd2cdeb565df8b5772c84a5229725c2600b00ac73a1efdfb127a8
-SHA512 (node-v14.19.3.tar.xz) = 0d03d9efee23664faf368a6ab42fa7d653033aebda1f2730c80692577825e31ff5522f1a940933245050a6f9af4ee64b6d65fc890e3d2ecfced327a909b63b6f
-Size (node-v14.19.3.tar.xz) = 34483792 bytes
+BLAKE2s (node-v14.20.0.tar.xz) = 07861c31cc674f6238b64c0c04c3320c4db9e3f3ed4cac9a743519ce1f441cec
+SHA512 (node-v14.20.0.tar.xz) = 400eb247c1d37ca64f4d643ab1852d2e1415ee190cf726b1e9b058386a1ebd6d7a9f40092afff228ec7980f37a78978252c1ef115aee47ec5b90c065f136b10f
+Size (node-v14.20.0.tar.xz) = 34487684 bytes
 SHA1 (patch-common.gypi) = f0bd2962bf7c8466db24b35a35154897ecad6316
 SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32
 SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3
--- a/lang/nodejs16/Makefile
+++ b/lang/nodejs16/Makefile
@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2022/06/02 09:45:46 adam Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2022/07/23 15:00:50 spz Exp $

-DISTNAME=	node-v16.15.1
+DISTNAME=	node-v16.16.0
 EXTRACT_SUFX=	.tar.xz

 USE_LANGUAGES=	c gnu++14
--- a/lang/nodejs16/distinfo
+++ b/lang/nodejs16/distinfo
@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2022/06/05 08:18:53 mef Exp $
+$NetBSD: distinfo,v 1.3.2.1 2022/07/23 15:00:50 spz Exp $

-BLAKE2s (node-v16.15.1.tar.xz) = eacc0b49edd39486d642b016eeffc26d7cdac63568e4833e2d41d822ea29e58f
-SHA512 (node-v16.15.1.tar.xz) = 18c05876f0afe6fd402a11824d1987ddadcb103d3ac16d5b500371536a5d53632c9cbf651b6f4a8d69b69e8bda2575beb7b68675c67fd6cd53e205acfba11038
-Size (node-v16.15.1.tar.xz) = 34618208 bytes
+BLAKE2s (node-v16.16.0.tar.xz) = e0a5079ad5f9f9a806f234ac4283cf2b335b6958f779504059c65b1dbc359e3f
+SHA512 (node-v16.16.0.tar.xz) = 828bfee4f3789b02fec512a7d9785bf02650401c61b2d3ff80d8a3876420927fb9c8d0c2d66e45e1e8370c47cb81140d434747588322c4fedca7fd9e42b84ac3
+Size (node-v16.16.0.tar.xz) = 35039712 bytes
 SHA1 (patch-common.gypi) = 15393846d9dce28f963ef66faa504d5bb3e92018
 SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32
 SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3
--- a/lang/openjdk11/Makefile
+++ b/lang/openjdk11/Makefile
@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.44 2022/05/14 12:02:56 tnn Exp $
+# $NetBSD: Makefile,v 1.44.2.1 2022/08/28 13:58:00 spz Exp $

 DISTNAME=	jdk11u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=	openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
-PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=	jdk11u
-GITHUB_TAG=	jdk-11.0.15+10-1
+GITHUB_TAG=	jdk-11.0.16+8-1

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://openjdk.java.net/
--- a/lang/openjdk11/distinfo
+++ b/lang/openjdk11/distinfo
@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2022/05/25 19:53:26 tnn Exp $
+$NetBSD: distinfo,v 1.34.2.1 2022/08/28 13:58:00 spz Exp $

 BLAKE2s (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = f93572f551f242344e5d6d5e46b9812e5b426772842b5fa06fea4422e327c871
 SHA512 (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = c4030c99e4c1bb209f0c1ca6c10665c3f4c906f9d7dc13b912c3fbb8031f3dbb6f8d2e5e966cbbc452c307ba5d6de816c0f000b5b7c5d4e3fe8511baf12aab49
@ -12,9 +12,9 @@ Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 96662264 bytes
 BLAKE2s (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 5aac0ec747ac714032dfcb4cc4f093ee3f9ddeb070301856727a8597cedd65cf
 SHA512 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 735f47d7398a48f0963c5d629c6c319dfe22d84bacd45f84a34f4784433c8cf6bfe6b356363a4591f035bec4a32e2e38d0a9c6be361aa57e5f0170ad4e16a1ad
 Size (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 99673444 bytes
-BLAKE2s (jdk11u-jdk-11.0.15-10-1.tar.gz) = 1ead16eff10210e68cd9c1407a9d729e248bb1ff075606d7fe3e5e62e4cde42d
-SHA512 (jdk11u-jdk-11.0.15-10-1.tar.gz) = f2d3b5cea79d737c7f4c5cdd2924aa7fd69fa6fb02fc8672f21060452f7483dc09157a7828642b3e43b033c26eaba0507ddd50491daceb6cf176cea47333857a
-Size (jdk11u-jdk-11.0.15-10-1.tar.gz) = 123036045 bytes
+BLAKE2s (jdk11u-jdk-11.0.16-8-1.tar.gz) = 335896a9a7c173f9e6d69b7e2bd2b98e773cfe5dc997bfb2ec367d13fe39be58
+SHA512 (jdk11u-jdk-11.0.16-8-1.tar.gz) = 33954a05fa8e2a2f0fb97db311569a6b6b9133450d143c78bf01fabee0435b245a9c2318b2c49b8b3023168ba171019e08d5dce5116b6b7c94dad8dd7d047b61
+Size (jdk11u-jdk-11.0.16-8-1.tar.gz) = 123280743 bytes
 SHA1 (patch-make_autoconf_buildjdk-spec.gmk.in) = d0b600237853c17ecc2864604f0bd847ba6b0149
 SHA1 (patch-make_autoconf_flags-cflags.m4) = 3b37853298805e2ffb92d3babd700d0048f24d8d
 SHA1 (patch-make_autoconf_hotspot.m4) = 437c8b09114933cca22c4a847a90a415cd113e5a
@ -22,17 +22,10 @@ SHA1 (patch-make_autoconf_lib-alsa.m4) = 999fbf951363f6b49b22aad81537728f22d7c38
 SHA1 (patch-make_autoconf_lib-bundled.m4) = 8720c3f674955e8a51b2ab7dba80c36d34ba8594
 SHA1 (patch-make_autoconf_lib-freetype.m4) = 3dbdfea4011dc69593ab302626b9ec4dfc7a7d54
 SHA1 (patch-make_autoconf_lib-x11.m4) = f609a726f2d795f1d05cc933df587d3440c09b9f
-SHA1 (patch-make_common_NativeCompilation.gmk) = fc97a952ba87efb450f59e87f19fb4c47558ae1d
 SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07
-SHA1 (patch-make_lib_Awt2dLibraries.gmk) = ab77cfd0f07425b694688ffa98c2c661d1ac017d
-SHA1 (patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp) = 97c6a06d6e957e267969cae3c9ad09c7ab9d0e56
-SHA1 (patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp) = cfaace9741b0b30daf827119127478a195f8374f
 SHA1 (patch-src_hotspot_os__cpu_bsd__arm_bsd__arm__32.s) = 474a66abfb25030d4e32134816c14b157d1ebe6a
-SHA1 (patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp) = 8a99417711c4826490954d43f142afc0a0c68e9f
-SHA1 (patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp) = 384214d554db82dc9092ee8f975aa5a73aae67ab
 SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 6322cbdda03dee528e89ac8b725f3df5e2165797
 SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = 7bb57f82f3a93adc1970ed4215148fc02ecbcd5a
 SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = e70e8c1e59f0be184a7a1d6e9d11ac7b934ce4b2
 SHA1 (patch-src_hotspot_share_libadt_dict.cpp) = a5c62973f563742d4ccc7db341b33366d14e2a01
-SHA1 (patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc) = 6635bba71373f65107f5324f68de41d1320bcad8
 SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = c27a058dbcc836fa5a9f979f193284a706a7c50b
--- a/lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk
+++ b/lang/openjdk11/patches/patch-make_common_NativeCompilation.gmk
@ -1,16 +0,0 @@
-$NetBSD: patch-make_common_NativeCompilation.gmk,v 1.1 2019/10/01 12:36:34 tnn Exp $
-
-Disable PaX mprotect.
-
--- make/common/NativeCompilation.gmk.orig	2019-09-19 12:22:38.000000000 +0000
-+++ make/common/NativeCompilation.gmk
-@@ -1012,6 +1012,9 @@ define SetupNativeCompilationBody
- 		    $$($1_MT) -nologo -manifest $$($1_MANIFEST) -identity:"$$($1_NAME).exe, version=$$($1_MANIFEST_VERSION)" -outputresource:$$@;#1
-                   endif
-                 endif
-+                ifeq ($(OPENJDK_TARGET_OS_ENV), bsd.netbsd)
-+		  /usr/sbin/paxctl +m $$@
-+                endif
-                 # This only works if the openjdk_codesign identity is present on the system. Let
-                 # silently fail otherwise.
-                 ifneq ($(CODESIGN), )
--- a/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk
+++ b/lang/openjdk11/patches/patch-make_lib_Awt2dLibraries.gmk
@ -1,17 +0,0 @@
-$NetBSD: patch-make_lib_Awt2dLibraries.gmk,v 1.1 2019/10/03 16:57:20 tnn Exp $
-
-bundled harfbuzz code needs to use -std=c++11 for static_assert().
-But we can't add it to USE_LANGUAGES because the rest of the JDK
-contains legacy code that requires -std=gnu++98.
-
--- make/lib/Awt2dLibraries.gmk.orig	2019-09-19 12:22:38.000000000 +0000
-+++ make/lib/Awt2dLibraries.gmk
-@@ -612,7 +612,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB
-         AccelGlyphCache.c, \
-     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-     CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
-    CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
-+    CXXFLAGS := $(CXXFLAGS_JDKLIB) -std=c++11 $(LIBFONTMANAGER_CFLAGS), \
-     OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
-     CFLAGS_windows = -DCC_NOEX, \
-     EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \
--- a/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1LIRAssemblerarm.cpp
+++ b/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1LIRAssemblerarm.cpp
@ -1,19 +0,0 @@
-$NetBSD: patch-src_hotspot_cpu_arm_c1__LIRAssembler__arm.cpp,v 1.1 2021/06/28 22:53:05 tnn Exp $
-
-error: call of overloaded 'log2_intptr(int&)' is ambiguous
-note: candidate: int log2_intptr(uintptr_t)
- inline int log2_intptr(uintptr_t x) {
-note: candidate: int log2_intptr(intptr_t)
- inline int log2_intptr(intptr_t x) {
-
--- src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp.orig	2021-04-24 02:47:22.000000000 +0000
-+++ src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
-@@ -1062,7 +1062,7 @@ void LIR_Assembler::emit_op3(LIR_Op3* op
-       __ add_32(dest, left, AsmOperand(left, lsr, 31));
-       __ asr_32(dest, dest, 1);
-     } else if (c != (int) 0x80000000) {
-      int power = log2_intptr(c);
-+      int power = log2_intptr((intptr_t)c);
-       __ asr_32(Rtemp, left, 31);
-       __ add_32(dest, left, AsmOperand(Rtemp, lsr, 32-power)); // dest = left + (left < 0 ? 2^power - 1 : 0);
-       __ asr_32(dest, dest, power);                            // dest = dest >>> power;
--- a/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1LIRGeneratorarm.cpp
+++ b/lang/openjdk11/patches/patch-src_hotspot_cpu_arm_c1LIRGeneratorarm.cpp
@ -1,27 +0,0 @@
-$NetBSD: patch-src_hotspot_cpu_arm_c1__LIRGenerator__arm.cpp,v 1.1 2021/06/28 22:53:05 tnn Exp $
-
-error: call of overloaded 'log2_intptr(int)' is ambiguous
-     LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c + 1);
-note: candidate: int log2_intptr(uintptr_t)
- inline int log2_intptr(uintptr_t x) {
-note: candidate: int log2_intptr(intptr_t)
- inline int log2_intptr(intptr_t x) {
-
--- src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp.orig	2021-04-24 02:47:22.000000000 +0000
-+++ src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
-@@ -443,13 +443,13 @@ bool LIRGenerator::strength_reduce_multi
-     __ shift_left(left, log2_intptr(c + 1), result);
-     __ sub(result, left, result);
- #else
-    LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c + 1);
-+    LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr((intptr_t)(c + 1));
-     LIR_Address* addr = new LIR_Address(left, left, scale, 0, T_INT);
-     __ sub(LIR_OprFact::address(addr), left, result); // rsb with shifted register
- #endif // AARCH64
-     return true;
-   } else if (is_power_of_2(c - 1)) {
-    LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr(c - 1);
-+    LIR_Address::Scale scale = (LIR_Address::Scale) log2_intptr((intptr_t)(c - 1));
-     LIR_Address* addr = new LIR_Address(left, left, scale, 0, T_INT);
-     __ add(left, LIR_OprFact::address(addr), result); // add with shifted register
-     return true;
--- a/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vmversionbsdarm32.cpp
+++ b/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__arm_vmversionbsdarm32.cpp
@ -1,25 +0,0 @@
-$NetBSD: patch-src_hotspot_os__cpu_bsd__arm_vm__version__bsd__arm__32.cpp,v 1.1 2021/06/28 22:53:05 tnn Exp $
-
-fix arch detection of NetBSD 32-bit ARM targets
-
--- src/hotspot/os_cpu/bsd_arm/vm_version_bsd_arm_32.cpp.orig	2021-04-24 02:47:22.000000000 +0000
-+++ src/hotspot/os_cpu/bsd_arm/vm_version_bsd_arm_32.cpp
-@@ -35,7 +35,7 @@ void VM_Version::get_os_cpu_info() {
- 
-   int mib[2];
-   size_t len;
-  char machine[8]; // 8 chars max : "arm" + "v6|v7" + "|eb" + '\0'
-+  char machine[11]; // 11 chars max : "earm" + "v6|v7" + "|hf" + "|eb" + '\0'
- 
-   // Support for multiple calls in the init phase
-   if (done) return;
-@@ -55,6 +55,9 @@ void VM_Version::get_os_cpu_info() {
-   } else if (strncmp(machine, "armv", 4) == 0 &&
-       machine[4] >= '5' && machine[4] <= '9') {
-     _arm_arch = (int)(machine[4] - '0');
-+  }  else if (strncmp(machine, "earmv", 5) == 0 &&
-+      machine[5] >= '5' && machine[5] <= '9') {
-+    _arm_arch = (int)(machine[5] - '0');
-   }
- }
- 
--- a/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_osbsdzero.cpp
+++ b/lang/openjdk11/patches/patch-src_hotspot_os__cpu_bsd__zero_osbsdzero.cpp
@ -1,31 +0,0 @@
-$NetBSD: patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp,v 1.1 2022/05/25 06:05:34 tnn Exp $
-
-#if 0 functions already defined in os_bsd.cpp
-
--- src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp.orig	2022-05-03 03:11:37.000000000 +0000
-+++ src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp
-@@ -340,13 +340,16 @@ static void current_stack_region(address
-   *size = stack_top - stack_bottom;
- }
- 
-+#if 0
- address os::current_stack_base() {
-   address bottom;
-   size_t size;
-   current_stack_region(&bottom, &size);
-   return bottom + size;
- }
-+#endif
- 
-+#if 0
- size_t os::current_stack_size() {
-   // stack size includes normal stack and HotSpot guard pages
-   address bottom;
-@@ -354,6 +357,7 @@ size_t os::current_stack_size() {
-   current_stack_region(&bottom, &size);
-   return size;
- }
-+#endif
- 
- /////////////////////////////////////////////////////////////////////////////
- // helper functions for fatal error handler
--- a/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc
+++ b/lang/openjdk11/patches/patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc
@ -1,34 +0,0 @@
-$NetBSD: patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc,v 1.2 2021/02/01 15:51:55 ryoon Exp $
-
-Completely remove _POSIX_C_SOURCE; with g++7 it causes errors about undeclared
-symbols such as
-
-In file included from /usr/pkg/gcc7/include/c++/math.h:36:0,
-                 from /pkg_comp/obj/pkgsrc/lang/openjdk11/default/openjdk-jdk11u-jdk-11.0.5-10-1/src/java.desktop/share/native/libfontmanager/harfbuzz/hb.hh:171,
-                 from /pkg_comp/obj/pkgsrc/lang/openjdk11/default/openjdk-jdk11u-jdk-11.0.5-10-1/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc:40:
-/usr/pkg/gcc7/include/c++/cmath:1084:11: error: '::acosh' has not been declared 
-   using ::acosh;
-           ^~~~~ 
-
-Very briefly: defining _POSIX_C_SOURCE only removes features, and therefore is
-almost never the correct thing to do.
-
-Filed upstream report to harfbuzz to patch this the same way:
-https://github.com/harfbuzz/harfbuzz/issues/2084
-
-
--- src/java.desktop/share/native/libharfbuzz/hb-blob.cc.orig	2019-10-16 18:31:09.000000000 +0000
-+++ src/java.desktop/share/native/libharfbuzz/hb-blob.cc
-@@ -30,12 +30,6 @@
-  * http://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
-  * https://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html
-  */
-#ifndef _POSIX_C_SOURCE
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-macros"
-#define _POSIX_C_SOURCE 200809L
-#pragma GCC diagnostic pop
-#endif
- 
- #include "hb.hh"
- #include "hb-blob.hh"
--- a/lang/openjdk8/Makefile
+++ b/lang/openjdk8/Makefile
@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.110 2021/12/08 16:05:22 adam Exp $
+# $NetBSD: Makefile,v 1.110.6.1 2022/08/28 13:58:00 spz Exp $

-DISTNAME=	openjdk-jdk8u-${GITHUB_TAG}
+DISTNAME=	jdk8u-${GITHUB_TAG}
 PKGNAME=	openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
-PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=battleblow/}
 MASTER_SITES+=	${MASTER_SITE_LOCAL:=openjdk7/}	# for bootstrap kits
-GITHUB_PROJECT=	openjdk-jdk8u
-GITHUB_TAG=	jdk8u292-b10.2
+GITHUB_PROJECT=	jdk8u
+GITHUB_TAG=	jdk8u342-b07.1

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://openjdk.java.net/
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.88 2022/05/24 21:32:43 tnn Exp $
+$NetBSD: distinfo,v 1.88.2.1 2022/08/28 13:58:00 spz Exp $

 BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 8745b980e290e509c0dd09706398b89afce85fee1405b9367b6684c83d56b96a
 SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4
@ -24,9 +24,9 @@ Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 379
 BLAKE2s (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 98777d4ff1f864a9ff5a42870b30319abd39488be2abfdc5e7d3d59b016c5807
 SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f
 Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
-BLAKE2s (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = e0f2a86f4b2f07229023bd9f18046bd490ecd98752cec47a1dfba66369b2d269
-SHA512 (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = 3614ef9ee4327242c62cdf80bee746c648a91e515e5611dcc8a2576fc6aaf073351132d910fcb16366302d59e615142ce9948be38eccbf236f250e9b15e6d752
-Size (openjdk7/openjdk-jdk8u-jdk8u292-b10.2.tar.gz) = 88568471 bytes
+BLAKE2s (openjdk7/jdk8u-jdk8u342-b07.1.tar.gz) = d6fab9676f8823b787cab9a818b4dfda9899e7a38f5d5c7cfeaafd172c64f05a
+SHA512 (openjdk7/jdk8u-jdk8u342-b07.1.tar.gz) = 8e3055a680d640879035246c1a0c612dd09f59f3b58d44c035c32fb7351e32d353c7b79a6cf784b432a533f98d462355da6456c6508175f7a15bb7297d138304
+Size (openjdk7/jdk8u-jdk8u342-b07.1.tar.gz) = 88770755 bytes
 SHA1 (patch-aa) = 8810cfed600ee3bf36a408cc77e497ac7b3e6838
 SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
 SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
@ -38,7 +38,7 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
 SHA1 (patch-bi) = 5409f0944d6f850baeaaa7c64d2e8ad52233e1e9
 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
 SHA1 (patch-common_autoconf_boot-jdk.m4) = a29767c79544dea243019cc841d834f756172462
-SHA1 (patch-common_autoconf_generated-configure.sh) = 6fb73788e7b1e98966f7005a10b7957745700ec9
+SHA1 (patch-common_autoconf_generated-configure.sh) = e28eec3e1e6de016d4f9356d781d925d3660547d
 SHA1 (patch-common_autoconf_spec.gmk.in) = 5fbf47f2241b5c898a75fb1741873043f1c983f0
 SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = 6e4c41b080577ed7cd418ee3b84f7f5a73dd11e6
 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
@ -62,7 +62,7 @@ SHA1 (patch-hotspot_src_cpu_aarch64_vm_vm__version__aarch64.hpp) = 6a766abe3c53e
 SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088
 SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = 446b96a91a2e4fa76f43ac653d1608f037c64af9
 SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_bytes__bsd__aarch64.inline.hpp) = acc0b870113ffc279d089da385e564f3ffd87f89
-SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp) = 10cab6ac79e57d6a36b9183ea62ff8b3965d68bb
+SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp) = 461717b25728884add18a8c68221ccea4ef81bbe
 SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_vm__version__bsd__aarch64.cpp) = d6762bb2a9fe6e158ccf23f7d04aa0cba588e78e
 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = f46713855507654be42707b1f80a779796929069
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6
@ -77,10 +77,6 @@ SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = e4321382dc95fe9e363abc8c8
 SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
 SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = c8840633681c01d4a911e32e8d79060fbbdc506e
 SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 589bf0707023b9f799caf2cafe5aeba89af46b05
-SHA1 (patch-hotspot_src_share_vm_classfile_symbolTable.cpp) = c0077a7691ce2ba698f46d9fc8c81bf974aef68c
-SHA1 (patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp) = b2bb8e74e43099fa9d1e157400bbb78386281235
-SHA1 (patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp) = 9e9347f9695cce3599fe12448445bb20d9b36f08
-SHA1 (patch-hotspot_src_share_vm_memory_metaspace.cpp) = 260005e002e0926447952850bbc1150e50a05509
 SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a544b97e56b329
 SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 35484c16c7ff1ce57b78c1c0fafa0dfcc7f0072a
 SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293
--- a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
+++ b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
@ -1,12 +1,8 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.21 2021/06/27 14:54:41 tnn Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.21.8.1 2022/08/28 13:58:00 spz Exp $

-BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386) and
-pkg/53223.
-Fix detection of GCC>=10.
-
--- common/autoconf/generated-configure.sh.orig	2021-05-14 21:52:06.000000000 +0000
+--- common/autoconf/generated-configure.sh.orig	2022-05-26 16:48:39.258220648 +0000
 +++ common/autoconf/generated-configure.sh
-@@ -4191,7 +4191,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi
+@@ -4198,7 +4198,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi
 # These toolchains are valid on different platforms
 VALID_TOOLCHAINS_bsd="clang gcc"
 VALID_TOOLCHAINS_linux="gcc clang"
@ -15,7 +11,7 @@ Fix detection of GCC>=10.
 VALID_TOOLCHAINS_macosx="gcc clang"
 VALID_TOOLCHAINS_aix="xlc"
 VALID_TOOLCHAINS_windows="microsoft"
-@@ -15482,9 +15482,6 @@ done
+@@ -15475,9 +15475,6 @@ done
   # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
   if test "x$MAKE" != x; then
     # User has supplied a make, test it.
@ -25,7 +21,7 @@ Fix detection of GCC>=10.
 
   MAKE_CANDIDATE=""$MAKE""
   DESCRIPTION="user supplied MAKE=$MAKE"
-@@ -20173,7 +20170,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -20352,7 +20349,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -34,7 +30,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -20505,7 +20502,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -20684,7 +20681,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -43,7 +39,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -20823,7 +20820,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21002,7 +20999,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -52,7 +48,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -21011,7 +21008,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21190,7 +21187,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -61,7 +57,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -21289,7 +21286,7 @@ fi
+@@ -21468,7 +21465,7 @@ fi
       # Resolve file symlinks
       while test $COUNTER -lt 20; do
         ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -70,7 +66,7 @@ Fix detection of GCC>=10.
           # This is not a symbolic link! We are done!
           break
         fi
-@@ -21339,7 +21336,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21518,7 +21515,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -79,7 +75,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -21554,7 +21551,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21733,7 +21730,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -88,7 +84,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -21734,7 +21731,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -21913,7 +21910,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -97,7 +93,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -21942,7 +21939,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22121,7 +22118,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -106,7 +102,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -22122,7 +22119,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22301,7 +22298,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -115,7 +111,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -22330,7 +22327,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22509,7 +22506,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -124,7 +120,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -22510,7 +22507,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22689,7 +22686,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -133,7 +129,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -22718,7 +22715,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -22897,7 +22894,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -142,7 +138,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -22898,7 +22895,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23077,7 +23074,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -151,7 +147,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -23093,7 +23090,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23272,7 +23269,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -160,7 +156,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -23271,7 +23268,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23450,7 +23447,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -169,7 +165,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -23467,7 +23464,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23646,7 +23643,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -178,7 +174,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -23645,7 +23642,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -23824,7 +23821,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -187,7 +183,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -23840,7 +23837,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -24019,7 +24016,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -196,7 +192,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -24018,7 +24015,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -24197,7 +24194,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -205,7 +201,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -24214,7 +24211,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -24393,7 +24390,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -214,7 +210,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -24392,7 +24389,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -24571,7 +24568,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -223,7 +219,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -24569,7 +24566,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -24748,7 +24745,7 @@ $as_echo "$as_me: Potential Boot JDK fou
             BOOT_JDK_FOUND=no
           else
             # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
@ -232,7 +228,7 @@ Fix detection of GCC>=10.
 
             # Extra M4 quote needed to protect [] in grep expression.
             FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -24975,16 +24972,15 @@ $as_echo_n "checking flags for boot jdk 
+@@ -25154,16 +25151,15 @@ $as_echo_n "checking flags for boot jdk 
   # Maximum amount of heap memory.
   # Maximum stack size.
   if test "x$BOOT_JDK_BITS" = x32; then
@ -250,7 +246,7 @@ Fix detection of GCC>=10.
 
   $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5
   $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5
-@@ -27518,7 +27514,7 @@ $as_echo_n "checking resolved symbolic l
+@@ -27719,7 +27715,7 @@ $as_echo_n "checking resolved symbolic l
       # Resolve file symlinks
       while test $COUNTER -lt 20; do
         ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -259,7 +255,7 @@ Fix detection of GCC>=10.
           # This is not a symbolic link! We are done!
           break
         fi
-@@ -27973,7 +27969,7 @@ $as_echo_n "checking for resolved symbol
+@@ -28174,7 +28170,7 @@ $as_echo_n "checking for resolved symbol
       # Resolve file symlinks
       while test $COUNTER -lt 20; do
         ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -268,7 +264,7 @@ Fix detection of GCC>=10.
           # This is not a symbolic link! We are done!
           break
         fi
-@@ -29259,7 +29255,7 @@ $as_echo_n "checking resolved symbolic l
+@@ -29460,7 +29456,7 @@ $as_echo_n "checking resolved symbolic l
       # Resolve file symlinks
       while test $COUNTER -lt 20; do
         ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -277,7 +273,7 @@ Fix detection of GCC>=10.
           # This is not a symbolic link! We are done!
           break
         fi
-@@ -29714,7 +29710,7 @@ $as_echo_n "checking for resolved symbol
+@@ -29915,7 +29911,7 @@ $as_echo_n "checking for resolved symbol
       # Resolve file symlinks
       while test $COUNTER -lt 20; do
         ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -286,7 +282,7 @@ Fix detection of GCC>=10.
           # This is not a symbolic link! We are done!
           break
         fi
-@@ -41431,6 +41427,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -42022,6 +42018,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
       SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
       SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
       SET_SHARED_LIBRARY_MAPFILE=''
@ -299,7 +295,7 @@ Fix detection of GCC>=10.
     else
       # Default works for linux, might work on other platforms as well.
       SHARED_LIBRARY_FLAGS='-shared'
-@@ -41482,7 +41484,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -42093,7 +42095,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
   if test "x$OPENJDK_TARGET_OS" = xsolaris; then
     CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
     CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
@ -309,7 +305,7 @@ Fix detection of GCC>=10.
   fi
   # The (cross) compiler is now configured, we can now test capabilities
   # of the target platform.
-@@ -41623,7 +41627,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -42253,7 +42257,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
   elif test "x$TOOLCHAIN_TYPE" = xgcc; then
     LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
     LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
@ -318,7 +314,7 @@ Fix detection of GCC>=10.
       LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
       LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
     fi
-@@ -42370,7 +42374,9 @@ $as_echo "$supports" >&6; }
+@@ -43112,7 +43116,9 @@ $as_echo "$supports" >&6; }
       # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
       # java heap.
       if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
@ -328,7 +324,7 @@ Fix detection of GCC>=10.
       fi
     fi
   fi
-@@ -42863,7 +42869,8 @@ $as_echo "alsa pulse x11" >&6; }
+@@ -43600,7 +43606,8 @@ $as_echo "alsa pulse x11" >&6; }
   if test "x$OPENJDK_TARGET_OS" = xbsd; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5
 $as_echo_n "checking what is not needed on BSD?... " >&6; }
@ -338,7 +334,7 @@ Fix detection of GCC>=10.
       ALSA_NOT_NEEDED=yes
       PULSE_NOT_NEEDED=yes
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
-@@ -44093,7 +44100,7 @@ $as_echo "$as_me: WARNING: Can't find pr
+@@ -44830,7 +44837,7 @@ $as_echo "$as_me: WARNING: Can't find pr
     BUILD_FREETYPE=no
   fi
   # Now check if configure found a version of 'msbuild.exe'
@ -347,7 +343,7 @@ Fix detection of GCC>=10.
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&5
 $as_echo "$as_me: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&2;}
     BUILD_FREETYPE=no
-@@ -44509,7 +44516,11 @@ $as_echo "$as_me: WARNING: --with-freety
+@@ -45246,7 +45253,11 @@ $as_echo "$as_me: WARNING: --with-freety
 
       # Allow --with-freetype-lib and --with-freetype-include to override
       if test "x$with_freetype_include" != x; then
@ -360,7 +356,7 @@ Fix detection of GCC>=10.
       fi
       if test "x$with_freetype_lib" != x; then
         POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
-@@ -47619,7 +47630,7 @@ $as_echo "$as_me: The path of FREETYPE_I
+@@ -48356,7 +48367,7 @@ $as_echo "$as_me: The path of FREETYPE_I
     FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
   fi
 
@ -369,7 +365,7 @@ Fix detection of GCC>=10.
         FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
       else
         FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
-@@ -47752,7 +47763,7 @@ $as_echo "$as_me: The path of FREETYPE_L
+@@ -48489,7 +48500,7 @@ $as_echo "$as_me: The path of FREETYPE_L
       if test "x$OPENJDK_TARGET_OS" = xwindows; then
         FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
       else
@ -378,7 +374,7 @@ Fix detection of GCC>=10.
       fi
     fi
 
-@@ -49089,9 +49100,6 @@ fi
+@@ -49824,9 +49835,6 @@ fi
 
 
 
@ -388,7 +384,7 @@ Fix detection of GCC>=10.
 
     llvm_components="jit mcjit engine nativecodegen native"
     unset LLVM_CFLAGS
-@@ -49134,7 +49142,7 @@ fi
+@@ -49869,7 +49877,7 @@ fi
   fi
 
   # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
--- a/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_osbsdaarch64.cpp
+++ b/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__aarch64_vm_osbsdaarch64.cpp
@ -1,10 +1,10 @@
-$NetBSD: patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp,v 1.1 2021/06/27 18:30:26 tnn Exp $
+$NetBSD: patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp,v 1.1.8.1 2022/08/28 13:58:00 spz Exp $

 NetBSD/evbarm-aarch64 support

--- hotspot/src/os_cpu/bsd_aarch64/vm/os_bsd_aarch64.cpp.orig	2021-05-14 21:52:06.000000000 +0000
+--- hotspot/src/os_cpu/bsd_aarch64/vm/os_bsd_aarch64.cpp.orig	2022-04-23 02:23:55.000000000 +0000
 +++ hotspot/src/os_cpu/bsd_aarch64/vm/os_bsd_aarch64.cpp
-@@ -107,6 +107,8 @@ address os::Bsd::ucontext_get_pc(ucontex
+@@ -110,6 +110,8 @@ address os::Bsd::ucontext_get_pc(ucontex
   return (address)uc->uc_mcontext.mc_gpregs.gp_elr;
 #elif defined(__OpenBSD__)
   return (address)uc->sc_elr;
@ -13,7 +13,7 @@ NetBSD/evbarm-aarch64 support
 #endif
 }
 
-@@ -115,6 +117,8 @@ void os::Bsd::ucontext_set_pc(ucontext_t
+@@ -118,6 +120,8 @@ void os::Bsd::ucontext_set_pc(ucontext_t
   uc->uc_mcontext.mc_gpregs.gp_elr = (intptr_t)pc;
 #elif defined(__OpenBSD__)
   uc->sc_elr = (unsigned long)pc;
@ -22,7 +22,7 @@ NetBSD/evbarm-aarch64 support
 #endif
 }
 
-@@ -123,6 +127,8 @@ intptr_t* os::Bsd::ucontext_get_sp(ucont
+@@ -126,6 +130,8 @@ intptr_t* os::Bsd::ucontext_get_sp(ucont
   return (intptr_t*)uc->uc_mcontext.mc_gpregs.gp_sp;
 #elif defined(__OpenBSD__)
   return (intptr_t*)uc->sc_sp;
@ -31,7 +31,7 @@ NetBSD/evbarm-aarch64 support
 #endif
 }
 
-@@ -131,6 +137,8 @@ intptr_t* os::Bsd::ucontext_get_fp(ucont
+@@ -134,6 +140,8 @@ intptr_t* os::Bsd::ucontext_get_fp(ucont
   return (intptr_t*)uc->uc_mcontext.mc_gpregs.gp_x[REG_FP];
 #elif defined(__OpenBSD__)
   return (intptr_t*)uc->sc_x[REG_FP];
@ -40,12 +40,12 @@ NetBSD/evbarm-aarch64 support
 #endif
 }
 
-@@ -285,7 +293,7 @@ JVM_handle_bsd_signal(int sig,
+@@ -288,7 +296,7 @@ JVM_handle_bsd_signal(int sig,
       return 1;
     }
 
-#ifndef AMD64
-+#if 0
+-#if !defined(AMD64) && !defined(__OpenBSD__)
+#if !defined(AMD64) && defined(SI_KERNEL)
     // Halt if SI_KERNEL before more crashes get misdiagnosed as Java bugs
     // This can happen in any running code (currently more frequently in
     // interpreter code but has been seen in compiled code)
--- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp
@ -1,16 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_classfile_symbolTable.cpp,v 1.1 2016/12/15 23:56:53 joerg Exp $
-
-Static member variables of templates must be defined. C++11 inline
-definitions would be an alternative.
-
--- hotspot/src/share/vm/classfile/symbolTable.cpp.orig	2016-12-10 16:08:22.000287424 +0000
-+++ hotspot/src/share/vm/classfile/symbolTable.cpp
-@@ -42,6 +42,8 @@
- 
- PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
- 
-+template <class T, MEMFLAGS F> juint RehashableHashtable<T, F>::_seed = 0;
-+
- // --------------------------------------------------------------------------
- 
- // the number of buckets a thread claims
--- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp
@ -1,17 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp,v 1.1 2016/12/15 23:56:53 joerg Exp $
-
-Static member variables of templates must be defined. C++11 inline
-definitions would be an alternative.
-
--- hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.orig	2016-12-10 16:01:00.232060787 +0000
-+++ hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
-@@ -48,6 +48,9 @@
- //// CompactibleFreeListSpace
- /////////////////////////////////////////////////////////////////////////
- 
-+template <class Chunk_t, class FreeList_t>
-+size_t TreeChunk<Chunk_t, FreeList_t>::_min_tree_chunk_size = sizeof(TreeChunk<Chunk_t,  FreeList_t>)/HeapWordSize;
-+
- // highest ranked  free list lock rank
- int CompactibleFreeListSpace::_lockRank = Mutex::leaf + 3;
- 
--- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp
@ -1,19 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp,v 1.1 2016/12/15 23:56:53 joerg Exp $
-
-defined() is not evaluated inside macros when used later.
-
--- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp.orig	2016-12-10 15:50:21.837559173 +0000
-+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
-@@ -35,7 +35,11 @@ typedef FormatBuffer<HRS_ERR_MSG_BUFSZ> 
- // HEAP_REGION_SET_FORCE_VERIFY to be 1, or in builds in which
- // asserts are compiled in.
- #ifndef HEAP_REGION_SET_FORCE_VERIFY
-#define HEAP_REGION_SET_FORCE_VERIFY defined(ASSERT)
-+#  if defined(ASSERT)
-+#  define HEAP_REGION_SET_FORCE_VERIFY 1
-+#  else
-+#  define HEAP_REGION_SET_FORCE_VERIFY 0
-+#  endif
- #endif // HEAP_REGION_SET_FORCE_VERIFY
- 
- class hrs_ext_msg;
--- a/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_memory_metaspace.cpp
@ -1,17 +0,0 @@
-$NetBSD: patch-hotspot_src_share_vm_memory_metaspace.cpp,v 1.1 2016/12/15 23:56:53 joerg Exp $
-
-Static member variables of templates must be defined. C++11 inline
-definitions would be an alternative.
-
--- hotspot/src/share/vm/memory/metaspace.cpp.orig	2016-12-10 16:06:04.248447262 +0000
-+++ hotspot/src/share/vm/memory/metaspace.cpp
-@@ -50,6 +50,9 @@
- 
- PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
- 
-+template <class Chunk_t, class FreeList_t>
-+size_t TreeChunk<Chunk_t, FreeList_t>::_min_tree_chunk_size = sizeof(TreeChunk<Chunk_t,  FreeList_t>)/HeapWordSize;
-+
- typedef BinaryTreeDictionary<Metablock, FreeList<Metablock> > BlockTreeDictionary;
- typedef BinaryTreeDictionary<Metachunk, FreeList<Metachunk> > ChunkTreeDictionary;
- 
--- a/lang/python310/distinfo
+++ b/lang/python310/distinfo
@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2022/06/08 17:56:46 adam Exp $
+$NetBSD: distinfo,v 1.16.2.1 2022/07/09 10:48:17 bsiegert Exp $

 BLAKE2s (Python-3.10.5.tar.xz) = d214998206e2adac9a487633cbb436fbedf31be48e86ef7f391fe6c7854805eb
 SHA512 (Python-3.10.5.tar.xz) = aa7f58a9b31de9824185b3e7bfa7da0dcf64ae9e89840664eae9d98d9048a650fa012cd5b873a62ff44b65b856db86f095c4003117406ec5e9583ec5f7e78e90
@ -13,4 +13,4 @@ SHA1 (patch-Modules_socketmodule.h) = 8761c7238bc74e45adefb6e647dc3b39b7bdd81c
 SHA1 (patch-Python_thread__pthread.h) = bf1aeab011b3afedc02e68fcf5cef091b3e0aefa
 SHA1 (patch-configure) = 8ffe98e51407d10e46e7d1531f2e0e0b58e1cfa6
 SHA1 (patch-pyconfig.h.in) = 1ab77914315acbf0352d242ed66200bea54548f6
-SHA1 (patch-setup.py) = f71085603ac5d343ee60c1d18f4f4bde0791fa6b
+SHA1 (patch-setup.py) = 0fd4a3eb38b324296e6da91612048f5d2dd10995
--- a/lang/python310/patches/patch-setup.py
+++ b/lang/python310/patches/patch-setup.py
@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.5 2022/04/03 10:54:52 riastradh Exp $
+$NetBSD: patch-setup.py,v 1.5.2.1 2022/07/09 10:48:17 bsiegert Exp $

 Disable certain modules, so they can be built as separate packages.
 Do not look for ncursesw.
@ -26,7 +26,7 @@ Enable cross-build by setting sys._home and sys.path to build directory
 from glob import glob, escape
 import _osx_support
 
-+sys.path = [p for p in sys.path if not re.compile('^' + sys.base_prefix + '/').match(p)]
+sys.path = [p for p in sys.path if not re.compile('^' + sys.base_prefix + '/lib').match(p)]
 
 try:
     import subprocess
--- a/lang/python39/distinfo
+++ b/lang/python39/distinfo
@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2022/05/18 08:07:32 adam Exp $
+$NetBSD: distinfo,v 1.29.2.1 2022/07/09 10:48:17 bsiegert Exp $

 BLAKE2s (Python-3.9.13.tar.xz) = e7774bfb171b74d6ba80e11c3c49a166832ff2fe466b37e885a250cd2a62ecf4
 SHA512 (Python-3.9.13.tar.xz) = e9664e7f908092df11236b22465d217531d6f0378e88d889108d19fe77f28f46ffb629b8733f84b41409e255367321893a2b1bd64518930d9d8cae5d1b774d23
@ -18,4 +18,4 @@ SHA1 (patch-Modules_socketmodule.h) = 8761c7238bc74e45adefb6e647dc3b39b7bdd81c
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
 SHA1 (patch-configure) = 944b8bb9601fd064333305778fb57997ce0ac531
 SHA1 (patch-pyconfig.h.in) = 2f06af7358690b46eaff404226b898962b049a0e
-SHA1 (patch-setup.py) = 12e485a46c63bfe4da3ee6f9072bdab3694830d2
+SHA1 (patch-setup.py) = 81c2ddc3a343c62e228392572d3b6c88b5f49b51
--- a/lang/python39/patches/patch-setup.py
+++ b/lang/python39/patches/patch-setup.py
@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.8 2022/04/03 10:51:19 riastradh Exp $
+$NetBSD: patch-setup.py,v 1.8.2.1 2022/07/09 10:48:18 bsiegert Exp $

 Disable certain modules, so they can be built as separate packages.
 Do not look for ncursesw.
@ -26,7 +26,7 @@ Enable cross-build by setting sys._home and sys.path to build directory
 from glob import glob, escape
 import _osx_support
 
-+sys.path = [p for p in sys.path if not re.compile('^' + sys.base_prefix + '/').match(p)]
+sys.path = [p for p in sys.path if not re.compile('^' + sys.base_prefix + '/lib').match(p)]
 
 try:
     import subprocess
--- a/lang/ruby/rails.mk
+++ b/lang/ruby/rails.mk
@ -1,4 +1,4 @@
-# $NetBSD: rails.mk,v 1.128 2022/06/07 15:12:58 taca Exp $
+# $NetBSD: rails.mk,v 1.128.2.4 2022/07/23 19:40:54 spz Exp $

 .if !defined(_RUBY_RAILS_MK)
 _RUBY_RAILS_MK=	# defined
@ -47,10 +47,10 @@ _RUBY_RAILS_MK=	# defined
 #
 # current Ruby on Rails versions.
 #
-RUBY_RAILS52_VERSION?=	5.2.8
-RUBY_RAILS60_VERSION?=	6.0.5
-RUBY_RAILS61_VERSION?=	6.1.6
-RUBY_RAILS70_VERSION?=	7.0.3
+RUBY_RAILS52_VERSION?=	5.2.8.1
+RUBY_RAILS60_VERSION?=	6.0.5.1
+RUBY_RAILS61_VERSION?=	6.1.6.1
+RUBY_RAILS70_VERSION?=	7.0.3.1

 RUBY_RAILS_ACCEPTED?=	# empty
 RUBY_RAILS_DEFAULT?=	52
--- a/mail/ruby-actionmailbox60/distinfo
+++ b/mail/ruby-actionmailbox60/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2022/06/07 14:59:21 taca Exp $
+$NetBSD: distinfo,v 1.18.2.1 2022/07/23 19:15:51 spz Exp $

-BLAKE2s (actionmailbox-6.0.5.gem) = ee05794b22d973f9bc681dcdb5b4c95afe676c52d4e961d5bf63cbdd7256b911
-SHA512 (actionmailbox-6.0.5.gem) = 0bea26e4622f7b279e43992fdcf80729688bfefbbde9d0142c66d2ea387092f00dc61b112de4022ad3b5110b33bf60c8eba515d954bc827360c7f4501714dc19
-Size (actionmailbox-6.0.5.gem) = 20992 bytes
+BLAKE2s (actionmailbox-6.0.5.1.gem) = 98697d5d8c416b9179a3b635203fdfca6a973059e07f646ef058377c88858817
+SHA512 (actionmailbox-6.0.5.1.gem) = d6deb0e008fde66bda68ebb19accfd0817ca69fcbd0e13be04c8757b86876ddd07c54640fb4f62bf43d1ec103c3e9fb0bd479beaf60ecd0ef99110a94f753796
+Size (actionmailbox-6.0.5.1.gem) = 20992 bytes
--- a/mail/ruby-actionmailbox61/distinfo
+++ b/mail/ruby-actionmailbox61/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2022/06/07 15:05:22 taca Exp $
+$NetBSD: distinfo,v 1.13.2.1 2022/07/23 19:35:08 spz Exp $

-BLAKE2s (actionmailbox-6.1.6.gem) = 61e384be242bd188f98ba2a7b40655daeafa62f3b981ed435b7c6371d8622e47
-SHA512 (actionmailbox-6.1.6.gem) = fd27bde6f7fe6e38375c3f23f66d1b400fd4bb7f04da02fbb362c5e4f87f057b400ce9e307a641d78a52854957752321381369ac468c9c7e31585fdde8c6ac95
-Size (actionmailbox-6.1.6.gem) = 22528 bytes
+BLAKE2s (actionmailbox-6.1.6.1.gem) = 1f5afce78ba1f47885977e5153d16ac61f096a6e76493c22a0abe93855340896
+SHA512 (actionmailbox-6.1.6.1.gem) = 4b06232817c9c5f6018be061a842d02cec37050802447d222d344eac4de1d6dae6487e64a9bbc7d33c1020dc5e0bc55e9c24af826609e9d28d03fdf34ba463bb
+Size (actionmailbox-6.1.6.1.gem) = 22528 bytes
--- a/mail/ruby-actionmailbox70/distinfo
+++ b/mail/ruby-actionmailbox70/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2022/06/07 15:21:08 taca Exp $
+$NetBSD: distinfo,v 1.6.2.1 2022/07/23 19:40:54 spz Exp $

-BLAKE2s (actionmailbox-7.0.3.gem) = 90ac48a2bbf598b8636315e870c18ce7f20d514d4f517db411f25725bd2b5ecb
-SHA512 (actionmailbox-7.0.3.gem) = b3158668b4cf86de5a99f8460a08c0c858fa0933a8155a7d69fe424198c27a03f5f03e441947dab181c676125808912e52cdb9a2c9eba5f086c84e458cdcc55d
-Size (actionmailbox-7.0.3.gem) = 22016 bytes
+BLAKE2s (actionmailbox-7.0.3.1.gem) = 5e0bbffc362e2fae88153fdca9a1a90c2259d26fefecfc5b7d9fce54ed46a5a6
+SHA512 (actionmailbox-7.0.3.1.gem) = f2f817e0413f9853ac2709b693912725689367b5378749923d37df3a31bfcaa403550097c20c94da44a629fe4c93fdf70dbcb9bfc0c4dfe7dad8085ff7b9b5b5
+Size (actionmailbox-7.0.3.1.gem) = 22016 bytes
--- a/mail/ruby-actionmailer52/distinfo
+++ b/mail/ruby-actionmailer52/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2022/06/07 14:48:12 taca Exp $
+$NetBSD: distinfo,v 1.14.2.1 2022/07/23 17:05:52 spz Exp $

-BLAKE2s (actionmailer-5.2.8.gem) = f4dcfc9064ac76d5e0754b13506b00359613ac26d10a5f1c8ce2432b394fe22c
-SHA512 (actionmailer-5.2.8.gem) = bc07878b59c3e7506e35580d563144d94e144a73b1fe777242b631b77031e7fc983aed641324867efa0bd45c0887f977cc1b39291ee0ca4cfd214aca823746e4
-Size (actionmailer-5.2.8.gem) = 29696 bytes
+BLAKE2s (actionmailer-5.2.8.1.gem) = 57bb2c12faaa1755a909a6f856bd1bad386dfd60c878d10341c4308a1e8f1572
+SHA512 (actionmailer-5.2.8.1.gem) = 169b64c066625164624d9ba67c0f0de58a81446b252aacc80d5100b0d25788928d025731915d1af92a6d8e28981d36e36146efde815872b1854c04466fecaecd
+Size (actionmailer-5.2.8.1.gem) = 29696 bytes
--- a/mail/ruby-actionmailer60/distinfo
+++ b/mail/ruby-actionmailer60/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2022/06/07 14:59:21 taca Exp $
+$NetBSD: distinfo,v 1.18.2.1 2022/07/23 19:15:51 spz Exp $

-BLAKE2s (actionmailer-6.0.5.gem) = dea15bf45a5c274dc69b4a91dc9713d7290e31f73695698852bef84123dc52ff
-SHA512 (actionmailer-6.0.5.gem) = 8df510261cca9beabd6a296fe83a1586aeb1deb5c441e11ddd54400befee0a50c56774082e775db006900ca55af914379060e00720869835b53d17389d66069b
-Size (actionmailer-6.0.5.gem) = 31232 bytes
+BLAKE2s (actionmailer-6.0.5.1.gem) = 06387e1f48b95b597dea0351375aa69b632b2fa194bda8562026fb87311c8924
+SHA512 (actionmailer-6.0.5.1.gem) = 0b681e0d9ef69b35331824b6e3955a31a6cba7bd9045806289910d67338389dacc5086e40e6ea7268a9f7e78e44509526893c03ce693b28901b04d678d0f28d1
+Size (actionmailer-6.0.5.1.gem) = 31232 bytes
--- a/mail/ruby-actionmailer61/distinfo
+++ b/mail/ruby-actionmailer61/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2022/06/07 15:05:22 taca Exp $
+$NetBSD: distinfo,v 1.13.2.1 2022/07/23 19:35:08 spz Exp $

-BLAKE2s (actionmailer-6.1.6.gem) = f2d12cdfefc0017e13e3489d03e597d4b864f8e736e4d0952c32199b44107bdd
-SHA512 (actionmailer-6.1.6.gem) = fc0b173b67bcca4b05e6f52329950c681ed2e49636fea8c6eba0822f72fb5d6436e18d9974e4f2f25223ce97f7b7569d8b29da3fe4d074299d4326099c3ba19e
-Size (actionmailer-6.1.6.gem) = 30720 bytes
+BLAKE2s (actionmailer-6.1.6.1.gem) = e9835f9de1cb4ddf1c6891c10fa48f6a298ee6e34e27a6015c66966dd6316d40
+SHA512 (actionmailer-6.1.6.1.gem) = 668919a7ab4062617d611553b5f62138ac65e1446d4ff019775e27a1337b6061fe5c1fb5a3b41b99da0a2b5d09e32f75cc1883383e585eae2dfaf03086a5eef1
+Size (actionmailer-6.1.6.1.gem) = 30720 bytes
--- a/mail/ruby-actionmailer70/distinfo
+++ b/mail/ruby-actionmailer70/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2022/06/07 15:20:42 taca Exp $
+$NetBSD: distinfo,v 1.6.2.1 2022/07/23 19:40:54 spz Exp $

-BLAKE2s (actionmailer-7.0.3.gem) = 116927d704a1d8eccdac46c9ca9503746075c30f9356f24bd1bbf787b00d6fe5
-SHA512 (actionmailer-7.0.3.gem) = d101b5d402ddc1efbf5cc757f5f9c3ba3b1836dccda44ed2d938bea563df7f9c7df2fdacd424e70a17c252b0febe31d3b3b43e4173170162e1e1208f8fc18c1d
-Size (actionmailer-7.0.3.gem) = 30720 bytes
+BLAKE2s (actionmailer-7.0.3.1.gem) = 639821c6138eaef56a53c292c136e2d1213935bfe40816e745524ae72ae71a61
+SHA512 (actionmailer-7.0.3.1.gem) = 298c4c90ff35cea6af9996067a7be49773e9c6753d3b6669409b38f9ad30918bb9071ee72b7210d8b061c056790c5e99f6731cb89307b6a2f405b87f68fdb6d9
+Size (actionmailer-7.0.3.1.gem) = 30720 bytes
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.120 2022/04/20 20:09:55 wiz Exp $
+# $NetBSD: Makefile,v 1.120.2.1 2022/08/27 15:42:20 spz Exp $

-DISTNAME=	rsync-3.2.4
+DISTNAME=	rsync-3.2.5
 CATEGORIES=	net
 MASTER_SITES=	http://rsync.samba.org/ftp/rsync/
 MASTER_SITES+=	http://rsync.samba.org/ftp/rsync/old-versions/
@ -17,7 +17,6 @@ CONFIGURE_ARGS+=	--with-included-zlib=no
 PKG_SYSCONFSUBDIR=	rsync
 TEST_TARGET=		test

-REPLACE_SH=		cmdormsg
 REPLACE_BASH=		rsync-ssl

 RCD_SCRIPTS=		rsyncd
--- a/net/rsync/distinfo
+++ b/net/rsync/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.55 2022/04/20 20:09:55 wiz Exp $
+$NetBSD: distinfo,v 1.55.2.1 2022/08/27 15:42:20 spz Exp $

-BLAKE2s (rsync-3.2.4.tar.gz) = e4d3fb4ecb3be5c31f011ba9dd2d8f5081395d74b474d73fd0e41c5579e8608c
-SHA512 (rsync-3.2.4.tar.gz) = 96318e2754fbddf84d16df671c721e577766969dfa415925c4dc1be2e4e60a51246623747a8aec0c6e9c0824e6aa7335235ccd07f3d6fd901f8cf28e2d6e91b6
-Size (rsync-3.2.4.tar.gz) = 1114853 bytes
+BLAKE2s (rsync-3.2.5.tar.gz) = f712d59eed2c74180634ecb1cb1700f06913e334e6e624c0d6f3b8611c814f75
+SHA512 (rsync-3.2.5.tar.gz) = 6d115acb5bae546cd2b5df2c11390f8609107b7a45aa649158d8daa0c9290ab5f15640fdd4000b21d1ab39f7385b85d77cd8fe4628fa13b2adeea6fcd53d057a
+Size (rsync-3.2.5.tar.gz) = 1129957 bytes
 SHA1 (patch-Makefile.in) = 34c3cc57846e451a0adbd19fcb19ae682b7e1ae3
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.142 2022/03/24 10:16:13 hauke Exp $
+# $NetBSD: Makefile,v 1.142.4.1 2022/08/28 08:13:40 spz Exp $

-DISTNAME=	samba-4.15.6
-PKGREVISION=	1
+DISTNAME=	samba-4.15.9
 CATEGORIES=	net
 MASTER_SITES=	https://download.samba.org/pub/samba/stable/

--- a/net/samba4/PLIST
+++ b/net/samba4/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2022/03/20 21:53:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.43.4.1 2022/08/28 08:13:40 spz Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/dumpmscat
@ -174,6 +174,7 @@ lib/libsmbclient.so.0
 lib/libsmbclient.so.0.7.0
 lib/libsmbconf.so
 lib/libsmbconf.so.0
+lib/libsmbconf.so.0.0.1
 ${PLIST.ldap}lib/libsmbldap.so
 ${PLIST.ldap}lib/libsmbldap.so.2
 ${PLIST.ldap}lib/libsmbldap.so.2.1.0
@ -461,6 +462,7 @@ ${PYSITELIB}/samba/tests/krb5/kcrypto.py
 ${PYSITELIB}/samba/tests/krb5/kdc_base_test.py
 ${PYSITELIB}/samba/tests/krb5/kdc_tests.py
 ${PYSITELIB}/samba/tests/krb5/kdc_tgs_tests.py
+${PYSITELIB}/samba/tests/krb5/kpasswd_tests.py
 ${PYSITELIB}/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
 ${PYSITELIB}/samba/tests/krb5/raw_testcase.py
 ${PYSITELIB}/samba/tests/krb5/rfc4120_constants.py
@ -601,6 +603,7 @@ ${PLIST.ads}lib/samba/bind9/dlz_bind9_11.${SOEXT}
 ${PLIST.ads}lib/samba/bind9/dlz_bind9_12.${SOEXT}
 ${PLIST.ads}lib/samba/bind9/dlz_bind9_14.${SOEXT}
 ${PLIST.ads}lib/samba/bind9/dlz_bind9_16.${SOEXT}
+${PLIST.ads}lib/samba/bind9/dlz_bind9_18.${SOEXT}
 ${PLIST.ads}lib/samba/gensec/krb5.${SOEXT}
 ${PLIST.ads}lib/samba/idmap/ad.${SOEXT}
 lib/samba/idmap/autorid.${SOEXT}
@ -1057,3 +1060,4 @@ ${PLIST.ads}share/samba/setup/ypServ30.ldif
@pkgdir var/db/samba4/private
@pkgdir var/log
@pkgdir var/run
+
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.77 2022/04/25 16:25:02 jperkin Exp $
+$NetBSD: distinfo,v 1.77.2.1 2022/08/28 08:13:40 spz Exp $

-BLAKE2s (samba-4.15.6.tar.gz) = b11fd56c12dfbb3e0dc3e7b5e25b73f964b3b26afcc504293f2050c9bb9b0cfd
-SHA512 (samba-4.15.6.tar.gz) = cd193d74173831449abc24f1769f0af2dabd5dd8a65507af7b09fde6dd5780d30336d59600add939b044cfa5781f357ec9192c7fed1a1e7278812b6c07b824e2
-Size (samba-4.15.6.tar.gz) = 19290189 bytes
+BLAKE2s (samba-4.15.9.tar.gz) = 04b96cc4ab3db3ed375c061d45300d0b9f1bbc741de67c93d0bca78227d9d0b5
+SHA512 (samba-4.15.9.tar.gz) = 2ee5d66f5a7c1ff5b27c959be6310335eb6484476c1eadb3b8ca1bc84fb2260487136c1318539e1dc459b81bca66f268fd979f6a816ff5f905bd605a99685004
+Size (samba-4.15.9.tar.gz) = 19324742 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = e4c0ed3dacfcf5613a5b397b3c6cf88509497da7
--- a/net/unbound/Makefile
+++ b/net/unbound/Makefile
@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.91 2022/06/02 13:02:38 he Exp $
+# $NetBSD: Makefile,v 1.91.2.1 2022/08/27 15:50:45 spz Exp $

-DISTNAME=	unbound-1.16.0
+DISTNAME=	unbound-1.16.2
 CATEGORIES=	net
 MASTER_SITES=	https://nlnetlabs.nl/downloads/unbound/

--- a/net/unbound/distinfo
+++ b/net/unbound/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.69 2022/06/02 13:02:38 he Exp $
+$NetBSD: distinfo,v 1.69.2.1 2022/08/27 15:50:45 spz Exp $

-BLAKE2s (unbound-1.16.0.tar.gz) = 9ab57da5c00f0d18a4c0d14dc10692f4976d5eca7a8d3c183b901f66b7aed909
-SHA512 (unbound-1.16.0.tar.gz) = 134679c0baad6738541295fcfbf8cc701c647b5d5cd00f87e50394bc7b5b74b7326ed2fc42f3282cae8094b4980c1e580d7b748b7151642c9060c449b644715f
-Size (unbound-1.16.0.tar.gz) = 6188349 bytes
+BLAKE2s (unbound-1.16.2.tar.gz) = 31ce353b16be4330598b918ca3596f2e5c9c85ca190f69b9c3aaeb5cf18c7602
+SHA512 (unbound-1.16.2.tar.gz) = 0ea65ea63265be677441bd2a28df12098ec5e86c3372240c2874f9bd13752b8b818da81ae6076cf02cbeba3d36e397698a4c2b50570be1a6a8e47f57a0251572
+Size (unbound-1.16.2.tar.gz) = 6204297 bytes
 SHA1 (patch-configure) = a949bdb26b37950c0301946af4521c9d0e984cf9
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.281 2022/06/21 18:48:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.281.2.1 2022/08/27 16:15:17 spz Exp $

 # Remember to upload-distfiles when updating OpenSSL -- otherwise it
 # is not possible for users who have bootstrapped without OpenSSL
 # to install it and enable HTTPS fetching.
-DISTNAME=	openssl-1.1.1p
+DISTNAME=	openssl-1.1.1q
 CATEGORIES=	security
 MASTER_SITES=	https://www.openssl.org/source/

--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.160 2022/06/21 18:48:39 jperkin Exp $
+$NetBSD: distinfo,v 1.160.2.1 2022/08/27 16:15:17 spz Exp $

-BLAKE2s (openssl-1.1.1p.tar.gz) = 9fe91a85ba0ee64d8225c80fa6fd5bf6294a3aae051a9681798aeb1520c6d1f8
-SHA512 (openssl-1.1.1p.tar.gz) = 203470b1cd37bdbfabfec5ef37fc97c991d9943f070c988316f6396b09dae7cea16ac884bd8646dbf7dd1ed40ebde6bdfa5700beee2d714d07c97cc70b4e48d9
-Size (openssl-1.1.1p.tar.gz) = 9860217 bytes
+BLAKE2s (openssl-1.1.1q.tar.gz) = 425462aecc856af9dfb5b2dedd5e3f7f7f74a2243570a4643a168f27e6cf5b9c
+SHA512 (openssl-1.1.1q.tar.gz) = cb9f184ec4974a3423ef59c8ec86b6bf523d5b887da2087ae58c217249da3246896fdd6966ee9c13aea9e6306783365239197e9f742c508a0e35e5744e3e085f
+Size (openssl-1.1.1q.tar.gz) = 9864061 bytes
 SHA1 (patch-Configurations_shared-info.pl) = 0e835f6e343b5d05ef9a0e6ef2a195201262d15c
 SHA1 (patch-Configurations_unix-Makefile.tmpl) = 3f47dd453381485aeb6c37dc53f932428fdcef50
 SHA1 (patch-Configure) = 479f1bc826f7721f6b44d6b5a6cf460432924bf2
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.118 2022/04/18 19:10:09 adam Exp $
+# $NetBSD: Makefile,v 1.118.2.1 2022/09/19 15:24:22 bsiegert Exp $

 .include "Makefile.common"

-PKGREVISION=	8
+PKGREVISION=	10

 BUILD_DEPENDS+=	docbook-xml-[0-9]*:../../textproc/docbook-xml
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
--- a/textproc/libxslt/distinfo
+++ b/textproc/libxslt/distinfo
@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.68 2021/10/26 11:22:18 nia Exp $
+$NetBSD: distinfo,v 1.68.6.1 2022/09/19 15:24:22 bsiegert Exp $

 BLAKE2s (libxslt-1.1.34.tar.gz) = e17d720708ac550a120ee49856cf3c4ea92663fc42e5011bbae1d3e660519183
 SHA512 (libxslt-1.1.34.tar.gz) = 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
 Size (libxslt-1.1.34.tar.gz) = 3552258 bytes
 SHA1 (patch-configure) = a63c214c7f5e4c4f89307c18519240372382c2fa
 SHA1 (patch-libexslt_date.c) = 40ce3940a93b6a2dc804f62676909d3313e0ea52
+SHA1 (patch-libxslt_transform.c) = 6d76f6fd91a8729bb6a3b61f4866453c0fd08c62
--- a/textproc/libxslt/patches/patch-libxslt_transform.c
+++ b/textproc/libxslt/patches/patch-libxslt_transform.c
@ -0,0 +1,159 @@
+$NetBSD: patch-libxslt_transform.c,v 1.1.2.2 2022/09/19 15:24:22 bsiegert Exp $
+
+Address CVE-2021-30560
+https://gitlab.gnome.org/GNOME/libxslt/-/commit/50f9c9cd3b7dfe9b3c8c795247752d1fdcadcac8
+
+--- libxslt/transform.c.orig	2019-10-23 17:36:39.000000000 +0000
+++ libxslt/transform.c
+@@ -1895,7 +1895,7 @@ static void
+ xsltDefaultProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr node,
+ 			  xsltStackElemPtr params) {
+     xmlNodePtr copy;
+-    xmlNodePtr delete = NULL, cur;
+    xmlNodePtr cur;
+     int nbchild = 0, oldSize;
+     int childno = 0, oldPos;
+     xsltTemplatePtr template;
+@@ -1968,54 +1968,13 @@ xsltDefaultProcessOneNode(xsltTransformC
+ 	    return;
+     }
+     /*
+-     * Handling of Elements: first pass, cleanup and counting
+     * Handling of Elements: first pass, counting
+      */
+     cur = node->children;
+     while (cur != NULL) {
+-	switch (cur->type) {
+-	    case XML_TEXT_NODE:
+-	    case XML_CDATA_SECTION_NODE:
+-	    case XML_DOCUMENT_NODE:
+-	    case XML_HTML_DOCUMENT_NODE:
+-	    case XML_ELEMENT_NODE:
+-	    case XML_PI_NODE:
+-	    case XML_COMMENT_NODE:
+-		nbchild++;
+-		break;
+-            case XML_DTD_NODE:
+-		/* Unlink the DTD, it's still reachable using doc->intSubset */
+-		if (cur->next != NULL)
+-		    cur->next->prev = cur->prev;
+-		if (cur->prev != NULL)
+-		    cur->prev->next = cur->next;
+-		break;
+-	    default:
+-#ifdef WITH_XSLT_DEBUG_PROCESS
+-		XSLT_TRACE(ctxt,XSLT_TRACE_PROCESS_NODE,xsltGenericDebug(xsltGenericDebugContext,
+-		 "xsltDefaultProcessOneNode: skipping node type %d\n",
+-		                 cur->type));
+-#endif
+-		delete = cur;
+-	}
+	if (IS_XSLT_REAL_NODE(cur))
+	    nbchild++;
+ 	cur = cur->next;
+-	if (delete != NULL) {
+-#ifdef WITH_XSLT_DEBUG_PROCESS
+-	    XSLT_TRACE(ctxt,XSLT_TRACE_PROCESS_NODE,xsltGenericDebug(xsltGenericDebugContext,
+-		 "xsltDefaultProcessOneNode: removing ignorable blank node\n"));
+-#endif
+-	    xmlUnlinkNode(delete);
+-	    xmlFreeNode(delete);
+-	    delete = NULL;
+-	}
+-    }
+-    if (delete != NULL) {
+-#ifdef WITH_XSLT_DEBUG_PROCESS
+-	XSLT_TRACE(ctxt,XSLT_TRACE_PROCESS_NODE,xsltGenericDebug(xsltGenericDebugContext,
+-	     "xsltDefaultProcessOneNode: removing ignorable blank node\n"));
+-#endif
+-	xmlUnlinkNode(delete);
+-	xmlFreeNode(delete);
+-	delete = NULL;
+     }
+ 
+     /*
+@@ -4864,7 +4823,7 @@ xsltApplyTemplates(xsltTransformContextP
+     xsltStylePreCompPtr comp = (xsltStylePreCompPtr) castedComp;
+ #endif
+     int i;
+-    xmlNodePtr cur, delNode = NULL, oldContextNode;
+    xmlNodePtr cur, oldContextNode;
+     xmlNodeSetPtr list = NULL, oldList;
+     xsltStackElemPtr withParams = NULL;
+     int oldXPProximityPosition, oldXPContextSize;
+@@ -4998,73 +4957,9 @@ xsltApplyTemplates(xsltTransformContextP
+ 	else
+ 	    cur = NULL;
+ 	while (cur != NULL) {
+-	    switch (cur->type) {
+-		case XML_TEXT_NODE:
+-		    if ((IS_BLANK_NODE(cur)) &&
+-			(cur->parent != NULL) &&
+-			(cur->parent->type == XML_ELEMENT_NODE) &&
+-			(ctxt->style->stripSpaces != NULL)) {
+-			const xmlChar *val;
+-
+-			if (cur->parent->ns != NULL) {
+-			    val = (const xmlChar *)
+-				  xmlHashLookup2(ctxt->style->stripSpaces,
+-						 cur->parent->name,
+-						 cur->parent->ns->href);
+-			    if (val == NULL) {
+-				val = (const xmlChar *)
+-				  xmlHashLookup2(ctxt->style->stripSpaces,
+-						 BAD_CAST "*",
+-						 cur->parent->ns->href);
+-			    }
+-			} else {
+-			    val = (const xmlChar *)
+-				  xmlHashLookup2(ctxt->style->stripSpaces,
+-						 cur->parent->name, NULL);
+-			}
+-			if ((val != NULL) &&
+-			    (xmlStrEqual(val, (xmlChar *) "strip"))) {
+-			    delNode = cur;
+-			    break;
+-			}
+-		    }
+-		    /* Intentional fall-through */
+-		case XML_ELEMENT_NODE:
+-		case XML_DOCUMENT_NODE:
+-		case XML_HTML_DOCUMENT_NODE:
+-		case XML_CDATA_SECTION_NODE:
+-		case XML_PI_NODE:
+-		case XML_COMMENT_NODE:
+-		    xmlXPathNodeSetAddUnique(list, cur);
+-		    break;
+-		case XML_DTD_NODE:
+-		    /* Unlink the DTD, it's still reachable
+-		     * using doc->intSubset */
+-		    if (cur->next != NULL)
+-			cur->next->prev = cur->prev;
+-		    if (cur->prev != NULL)
+-			cur->prev->next = cur->next;
+-		    break;
+-		case XML_NAMESPACE_DECL:
+-		    break;
+-		default:
+-#ifdef WITH_XSLT_DEBUG_PROCESS
+-		    XSLT_TRACE(ctxt,XSLT_TRACE_APPLY_TEMPLATES,xsltGenericDebug(xsltGenericDebugContext,
+-		     "xsltApplyTemplates: skipping cur type %d\n",
+-				     cur->type));
+-#endif
+-		    delNode = cur;
+-	    }
+            if (IS_XSLT_REAL_NODE(cur))
+		xmlXPathNodeSetAddUnique(list, cur);
+ 	    cur = cur->next;
+-	    if (delNode != NULL) {
+-#ifdef WITH_XSLT_DEBUG_PROCESS
+-		XSLT_TRACE(ctxt,XSLT_TRACE_APPLY_TEMPLATES,xsltGenericDebug(xsltGenericDebugContext,
+-		     "xsltApplyTemplates: removing ignorable blank cur\n"));
+-#endif
+-		xmlUnlinkNode(delNode);
+-		xmlFreeNode(delNode);
+-		delNode = NULL;
+-	    }
+ 	}
+     }
+ 
--- a/textproc/ruby-actiontext60/distinfo
+++ b/textproc/ruby-actiontext60/distinfo
@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2022/06/07 14:59:21 taca Exp $
+$NetBSD: distinfo,v 1.18.2.1 2022/07/23 19:15:51 spz Exp $

-BLAKE2s (actiontext-6.0.5.gem) = 221a97774bcec0c0d8cacb7bca63d29c56ca0ef2a8d37d42561d4f2a55c49ba3
-SHA512 (actiontext-6.0.5.gem) = caa11d9d5e4cea196bf541a36cb7ac121cd33d425221f1b35f64421ab7a44b93b79198ba5947fdf172ccd4dac443345812d1a6387ab956897a0c8455f32c3bad
-Size (actiontext-6.0.5.gem) = 17920 bytes
+BLAKE2s (actiontext-6.0.5.1.gem) = 4f22a2737e8c3a13c62eab07592c12fc7f6efece71648e57b05a48dde8806e99
+SHA512 (actiontext-6.0.5.1.gem) = 85af53c77955a87d35d3c6f199859fa9bd9ef0f24ccc0af62a8e2e8ae98fd0db82becc89e93703624eb0f1e8862b54bbf71945cd001797fd19a48e6e29a7a4a2
+Size (actiontext-6.0.5.1.gem) = 17920 bytes
--- a/Show More
+++ b/Show More