net/drill: undo mistaken commit to branch.

mail/roundcube: security fix

Revisions pulled up:
- mail/roundcube-plugin-enigma/Makefile                         1.16
- mail/roundcube-plugin-enigma/PLIST                            1.6
- mail/roundcube-plugin-password/Makefile                       1.22
- mail/roundcube-plugin-password/PLIST                          1.7
- mail/roundcube-plugin-password/distinfo                       1.32-1.33
- mail/roundcube-plugin-zipdownload/Makefile                    1.13
- mail/roundcube-plugin-zipdownload/PLIST                       1.6
- mail/roundcube/Makefile                                       1.98-1.99
- mail/roundcube/Makefile.common                                1.30-1.31
- mail/roundcube/PLIST                                          1.53-1.55
- mail/roundcube/distinfo                                       1.84-1.85

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Jul  7 12:57:21 UTC 2023

   Modified Files:
   	pkgsrc/mail/roundcube: Makefile.common PLIST distinfo
   	pkgsrc/mail/roundcube-plugin-enigma: PLIST
   	pkgsrc/mail/roundcube-plugin-password: PLIST distinfo
   	pkgsrc/mail/roundcube-plugin-zipdownload: PLIST

   Log Message:
   mail/roundcube: update to 1.6.2

   1.6.2 (2023-07-02)

   * Add Uyghur localization
   * Fix regression in OAuth request URI caused by use of REQUEST_URI instead
     of SCRIPT_NAME as a default (#8878)
   * Fix bug where false attachment reminder was displayed on HTML mail with
     inline images (#8885)
   * Fix bug where a non-ASCII character in app.js could cause error in
     javascript engine (#8894)
   * Fix JWT decoding with url safe base64 schema (#8890)
   * Fix bug where .wav instead of .mp3 file was used for the new mail
     notification in Firefox (#8895)
   * Fix PHP8 warning (#8891)
   * Fix support for Windows-31J charset (#8869)
   * Fix so LDAP VLV option is disabled by default as documented (#8833)
   * Fix so an email address with name is supported as input to the managesieve
     notify :from parameter (#8918)
   * Fix Help plugin menu (#8898)
   * Fix invalid onclick handler on the logo image when using non-array
     skin_logo setting (#8933)
   * Fix duplicate recipients in "To" and "Cc" on reply (#8912)
   * Fix bug where it wasn't possible to scroll lists by clicking middle mouse
     button (#8942)
   * Fix bug where label text in a single-input dialog could be partially
     invisible in some locales (#8905)
   * Fix bug where LDAP (fulltext) search didn't work without 'search_fields'
     in config (#8874)
   * Fix extra leading newlines in plain text converted from HTML (#8973)
   * Fix so recipients with a domain ending with .s are allowed (#8854)
   * Fix so vCard output does not contain non-standard/redundant TYPE=OTHER and
     TYPE=INTERNET (#8838)
   * Fix QR code images for contacts with non-ASCII characters (#9001)
   * Fix PHP8 warnings when using list_flags and list_cols properties by
     plugins (#8998)
   * Fix bug where subfolders could loose subscription on parent folder rename
     (#8892)
   * Fix connecting to LDAP using an URI with ldapi:// scheme (#8990)
   * Fix insecure shell command params handling in cmd_learn driver of
     markasjunk plugin (#9005)
   * Fix bug where some mail headers didn't work in cmd_learn driver of
     markasjunk plugin (#9005)
   * Fix PHP fatal error when importing vcf file using PHP 8.2 (#9025)
   * Fix so output of log_date_format with microseconds contains time in server
     time zone, not UTC

---
   Module Name:	pkgsrc
   Committed By:	abs
   Date:		Thu Jul 27 08:18:00 UTC 2023

   Modified Files:
   	pkgsrc/mail/roundcube: Makefile PLIST

   Log Message:
   Also install the "vendor/" contents to resolve guzzlehttp requirement

   Bump PKGREVISION

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Sep 18 03:39:03 UTC 2023

   Modified Files:
   	pkgsrc/mail/roundcube: Makefile Makefile.common PLIST distinfo
   	pkgsrc/mail/roundcube-plugin-enigma: Makefile
   	pkgsrc/mail/roundcube-plugin-password: Makefile distinfo
   	pkgsrc/mail/roundcube-plugin-zipdownload: Makefile

   Log Message:
   mail/roundcube: update to 1.6.3

   From release announce:

   We just published a security update to the version 1.6 of Roundcube Webmail.
   It provides a fix to a recently reported XSS vulnerability:

   Fix cross-site scripting (XSS) vulnerability in handling of linkrefs in
   plain text messages, reported by Niraj Shivtarkar.  See the full changelog
   in the release notes in the release notes on the Github download page.

   We strongly recommend to update all productive installations of Roundcube
   1.6.x with this new version.

   1.6.3 (2023-09-15)

   * Fix bug where installto.sh/update.sh scripts were removing some essential
     options from the config file (#9051)

   * Update jQuery-UI to version 1.13.2 (#9041)

   * Fix regression that broke use_secure_urls feature (#9052)

   * Fix potential PHP fatal error when opening a message with message/rfc822
     part (#8953)

   * Fix bug where a duplicate `<title>` tag in HTML email could cause some
     parts being cut off (#9029)

   * Fix bug where a list of folders could have been sorted incorrectly (#9057)

   * Fix regression where LDAP addressbook 'filter' option was ignored (#9061)

   * Fix wrong order of a multi-folder search result when sorting by size
     (#9065)

   * Fix so install/update scripts do not require PEAR (#9037)

   * Fix regression where some mail parts could have been decoded incorrectly,
     or not at all (#9096)

   * Fix handling of an error case in Cyrus IMAP BINARY FETCH, fallback to
     non-binary FETCH (#9097)

   * Fix PHP8 deprecation warning in the reconnect plugin (#9083)

   * Fix "Show source" on mobile with x_frame_options = deny (#9084)

   * Fix various PHP warnings (#9098)

   * Fix deprecated use of ldap_connect() in password's ldap_simple driver
     (#9060)

   * Fix cross-site scripting (XSS) vulnerability in handling of linkrefs in
     plain text messages

chat/ejabberd/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2023/01/11 22:07:46 nikita Exp $
+# $NetBSD: Makefile,v 1.98.4.1 2023/08/15 19:12:24 bsiegert Exp $
 
 DISTNAME=	ejabberd-22.05
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat
 MASTER_SITES=	https://www.process-one.net/downloads/downloads-action.php?file=/${PKGVERSION_NOREV}/
 

chat/ejabberd/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.68 2023/01/08 16:19:05 gdt Exp $
+$NetBSD: distinfo,v 1.68.4.1 2023/08/15 19:12:24 bsiegert Exp $
 
 BLAKE2s (ejabberd-22.05.tar.gz) = 657dcfe4ee9f78fbba344588c255c8d3be8ee155e55c702b125fd0626673b908
 SHA512 (ejabberd-22.05.tar.gz) = 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
 Size (ejabberd-22.05.tar.gz) = 2527957 bytes
-SHA1 (patch-aa) = c48f1b242777a4610cdbecb32791ce614e0ef80d
+SHA1 (patch-aa) = 8544545d6a858a4853d339743d9f35c9506af241
 SHA1 (patch-ae) = de7536dbafab8d14430faa5fcbd767c238a151e5
 SHA1 (patch-m4_erlang-extra.m4) = 3b89c1a8212e8a45ae319b30606a41429762e2fe
 SHA1 (patch-tools_ejabberdctl.bc) = 167f542c95f8e25ba601076ad717a85bfd456dc7

chat/ejabberd/patches/patch-aa

@@ -1,19 +1,23 @@
-$NetBSD: patch-aa,v 1.17 2022/10/15 18:20:40 triaxx Exp $
+$NetBSD: patch-aa,v 1.17.6.1 2023/08/15 19:12:24 bsiegert Exp $
 
 Fix locations; don't mess with ownership.
 
---- Makefile.in.orig	2022-05-06 13:12:22.000000000 +0000
-+++ Makefile.in
-@@ -10,7 +10,7 @@ exec_prefix = @exec_prefix@
+--- Makefile.in.orig	2022-05-06 15:12:22.000000000 +0200
++++ Makefile.in	2023-08-11 09:08:52.337637204 +0200
+@@ -9,9 +9,10 @@
+ 
  DESTDIR =
  
  # /etc/ejabberd/
 -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
 +ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd
++SYSCONFDIR_ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
  
  # /bin/
  BINDIR = $(DESTDIR)@bindir@
-@@ -22,7 +22,7 @@ SBINDIR = $(DESTDIR)@sbindir@
+ 
+@@ -21,9 +22,9 @@
+ # /lib/
  LIBDIR =  $(DESTDIR)@libdir@
  
  # /lib/ejabberd/
@@ -22,7 +26,9 @@ Fix locations; don't mess with ownership.
  
  # /share/doc/ejabberd
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -66,31 +66,18 @@ SQLDIR = $(PRIVDIR)/sql
+ datarootdir = @datarootdir@
+@@ -65,33 +66,20 @@
+ # /usr/lib/ejabberd/priv/lua
  LUADIR = $(PRIVDIR)/lua
  
  # /var/lib/ejabberd/
@@ -56,3 +62,31 @@ Fix locations; don't mess with ownership.
  
  ifeq "$(MIX)" "mix"
  REBAR_VER:=6
+ REBAR_VER_318:=0
+@@ -293,21 +281,21 @@
+ 		-e "s*{{bindir}}/iex*$(iexpath)*g" \
+ 		-e "s*{{bindir}}*@bindir@*g" \
+ 		-e "s*{{libdir}}*${relivelibdir}*g" \
+ 		-e "s*{{erl}}*@ERL@*g" \
+-		-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
+-		> ejabberdctl.relive
++		-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template | \
++	$(SED)  -e "s*\${DESTDIR}**g" > ejabberdctl.relive
+ 
+ ejabberdctl.example: vars.config
+ 	$(SED)  -e "s*{{installuser}}*@INSTALLUSER@*g" \
+-		-e "s*{{config_dir}}*${ETCDIR}*g" \
++		-e "s*{{config_dir}}*${SYSCONFDIR_ETCDIR}*g" \
+ 		-e "s*{{logs_dir}}*${LOGDIR}*g" \
+ 		-e "s*{{spool_dir}}*${SPOOLDIR}*g" \
+ 		-e "s*{{bindir}}*@bindir@*g" \
+ 		-e "s*{{libdir}}*@libdir@*g" \
+ 		-e "s*{{erl}}*@ERL@*g" \
+-		-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
+-		> ejabberdctl.example
++		-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template | \
++	$(SED)  -e "s*\${DESTDIR}**g" > ejabberdctl.example
+ 
+ install: copy-files ejabberdctl.example
+ 	#
+ 	# Configuration files

databases/mariadb105-client/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2023/04/19 08:09:25 adam Exp $
+# $NetBSD: Makefile,v 1.15.2.1 2023/07/10 10:11:24 bsiegert Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	MariaDB 10.5, a free MySQL compatible database (client)
 
 CONFLICTS=	mysql-client-[0-9]*

databases/mariadb105-client/Makefile.common

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.20 2023/03/18 15:05:41 nia Exp $
+# $NetBSD: Makefile.common,v 1.20.4.1 2023/07/10 10:11:24 bsiegert Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
 
-DISTNAME=	mariadb-10.5.19
+DISTNAME=	mariadb-10.5.21
 CATEGORIES=	databases
 MASTER_SITES=	https://archive.mariadb.org/${DISTNAME}/source/
 

databases/mariadb105-client/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2023/03/18 15:05:41 nia Exp $
+@comment $NetBSD: PLIST,v 1.6.4.1 2023/07/10 10:11:24 bsiegert Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -48,6 +48,7 @@ include/mysql/mariadb_dyncol.h
 include/mysql/mariadb_rpl.h
 include/mysql/mariadb_stmt.h
 include/mysql/mariadb_version.h
+include/mysql/my_alloca.h
 include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_sys.h
@@ -74,6 +75,7 @@ include/mysql/server/m_string.h
 include/mysql/server/ma_dyncol.h
 include/mysql/server/mariadb_capi_rename.h
 include/mysql/server/my_alloc.h
+include/mysql/server/my_alloca.h
 include/mysql/server/my_attribute.h
 include/mysql/server/my_byteorder.h
 include/mysql/server/my_compiler.h

databases/mariadb105-client/distinfo

@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.18 2023/03/18 15:05:41 nia Exp $
+$NetBSD: distinfo,v 1.18.4.1 2023/07/10 10:11:24 bsiegert Exp $
 
-BLAKE2s (mariadb-10.5.19.tar.gz) = cc7735ea49b9b2f5e14a9534b26859461b977266bfa605e44201e9dfcc431f92
-SHA512 (mariadb-10.5.19.tar.gz) = 4a72ca4dfee0d3fa5432495f62c7eb03addc067e2f023b1ebe32bd1d3a0687c2c61c3316c0c4f690db4f74559bce668c6accbe137d906a52116db2bb2f454699
-Size (mariadb-10.5.19.tar.gz) = 111958233 bytes
+BLAKE2s (mariadb-10.5.21.tar.gz) = 1f2eaa28d86256bb1092c5e2578ad116ad2243317d2a087a65c49c3d0dcb0f0a
+SHA512 (mariadb-10.5.21.tar.gz) = b95d66e32153ae609450a98da2b32d7bccde80c4cb41070655084d2064d713b21ce460ce275a2b84513dec2567f44aaa2c358230bbd620ae13a0829587339e0c
+Size (mariadb-10.5.21.tar.gz) = 112102574 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 574131db46854715758c60ba5f026498f5b29564
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-client_mysql.cc) = 89fe80fb66b8791131a8c6d1b209e57082804a01
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
-SHA1 (patch-include_mysql_service__encryption.h) = bfc2fcba9f33cc58b726f8645dc5400a0df27bd9
 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66
 SHA1 (patch-mysys_my__gethwaddr.c) = f4fd827617697ff386099defc839fe8d082e6c3e
 SHA1 (patch-plugin_auth__pam_testing_pam__mariadb__mtr.c) = 5c7978b5bec79bbc09d3ebeb69dd85f3e6f8a423

databases/mariadb105-client/patches/patch-include_mysql_service__encryption.h

@@ -1,15 +0,0 @@
-$NetBSD: patch-include_mysql_service__encryption.h,v 1.1 2023/03/07 10:28:02 jperkin Exp $
-
-SunOS always needs alloca.h.
-
---- include/mysql/service_encryption.h.orig	2022-11-02 12:37:17.000000000 +0000
-+++ include/mysql/service_encryption.h
-@@ -36,7 +36,7 @@ extern "C" {
- #endif
- #else
- #include <stdlib.h>
--#ifdef HAVE_ALLOCA_H
-+#if defined(HAVE_ALLOCA_H) || defined(__sun)
- #include <alloca.h>
- #endif
- #endif

databases/mariadb105-server/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2023/04/23 14:26:14 adam Exp $
+# $NetBSD: Makefile,v 1.35.2.1 2023/07/10 10:11:24 bsiegert Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	2
 COMMENT=	MariaDB 10.5, a free MySQL compatible database (server)
 
 CONFLICTS=	mysql-server-[0-9]*

databases/mariadb106-client/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2023/04/19 08:09:25 adam Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2023/07/10 11:49:05 bsiegert Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	MariaDB 10.6, a free MySQL compatible database (client)
 
 CONFLICTS=	mysql-client-[0-9]*

databases/mariadb106-client/Makefile.common

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.16 2023/03/11 16:39:33 nia Exp $
+# $NetBSD: Makefile.common,v 1.16.4.1 2023/07/10 11:49:05 bsiegert Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
 
-DISTNAME=	mariadb-10.6.12
+DISTNAME=	mariadb-10.6.14
 CATEGORIES=	databases
 MASTER_SITES=	https://archive.mariadb.org/${DISTNAME}/source/
 

databases/mariadb106-client/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2023/03/11 16:39:33 nia Exp $
+@comment $NetBSD: PLIST,v 1.6.4.1 2023/07/10 11:49:05 bsiegert Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -51,6 +51,7 @@ include/mysql/mariadb_dyncol.h
 include/mysql/mariadb_rpl.h
 include/mysql/mariadb_stmt.h
 include/mysql/mariadb_version.h
+include/mysql/my_alloca.h
 include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_sys.h
@@ -77,6 +78,7 @@ include/mysql/server/m_string.h
 include/mysql/server/ma_dyncol.h
 include/mysql/server/mariadb_capi_rename.h
 include/mysql/server/my_alloc.h
+include/mysql/server/my_alloca.h
 include/mysql/server/my_attribute.h
 include/mysql/server/my_byteorder.h
 include/mysql/server/my_compiler.h

databases/mariadb106-client/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2023/03/11 16:39:33 nia Exp $
+$NetBSD: distinfo,v 1.14.4.1 2023/07/10 11:49:05 bsiegert Exp $
 
-BLAKE2s (mariadb-10.6.12.tar.gz) = 4a6c9dc5d716dd79d0f66134d46658d7d129e5872123ef744f9885c6e0968bb3
-SHA512 (mariadb-10.6.12.tar.gz) = f6d5178ce2a4d755367bb805f23e849824ee4c982a01a114c35a13d250a9b3b2a93ac9b745fb3685fd9e6b44deff0b5c936b43e5441d3af8a300881109db0549
-Size (mariadb-10.6.12.tar.gz) = 95085449 bytes
+BLAKE2s (mariadb-10.6.14.tar.gz) = 9ae3d8d55d668156e40f6a1611200d9731f1869c1b9ad5d8c3e44774eecbe5a1
+SHA512 (mariadb-10.6.14.tar.gz) = 11b88480ac61303172e98ed3271c8172e840cded5175caba1469d6ec063df647b536ee6e95f110abd8d95d95c9b8d7edf1cb611113be225d5e8eeb2041f86438
+Size (mariadb-10.6.14.tar.gz) = 95286643 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 042d9d361a5c3ff7e7df15f5de4a30eb7984cddd
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88

databases/mariadb106-server/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2023/04/23 14:26:14 adam Exp $
+# $NetBSD: Makefile,v 1.25.2.1 2023/07/10 11:49:05 bsiegert Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	2
 COMMENT=	MariaDB 10.6, a free MySQL compatible database (server)
 
 CONFLICTS=	mysql-server-[0-9]*

databases/ruby-activerecord61/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2023/03/15 13:31:48 taca Exp $
+$NetBSD: distinfo,v 1.18.4.1 2023/06/30 18:41:55 bsiegert Exp $
 
-BLAKE2s (activerecord-6.1.7.3.gem) = 4eebb162799a4deda3979fba2c0d962bda8c509ad47222e7d79a6c3724492f99
-SHA512 (activerecord-6.1.7.3.gem) = dbe06f55fdb1c528d7333eae7ba5530884a66fed19b25d8c729507973c33165e12b2f864facc5abf3476d5814b2dd729e541fdd610dc69fad4088e6124caa695
-Size (activerecord-6.1.7.3.gem) = 434176 bytes
+BLAKE2s (activerecord-6.1.7.4.gem) = 38031ea41b17c47bd768cba8a739e1947024ed58ab476f802b4ba89756dbd8ef
+SHA512 (activerecord-6.1.7.4.gem) = ed8eda8b605ee1db8b98c6a4bb3567329fc1fee3c1d2df75f8351ab70991fb18d554fb83b5bccc8bc4c610f85ac3275759b5a84092fa146f5acda2208ba6dfa6
+Size (activerecord-6.1.7.4.gem) = 434176 bytes

databases/ruby-activerecord70/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2023/05/28 01:54:17 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2023/07/03 18:39:39 bsiegert Exp $
 
-BLAKE2s (activerecord-7.0.5.gem) = 123706526021dbc2cbcab42c57ed6056de34c998182bc343c13e0c5523e623cb
-SHA512 (activerecord-7.0.5.gem) = b8bb05a6ae11defa1c01374fee1b950967f42d0d4f7e3c1d50b522b77dd8175cafe1a7248a235435d2719ca2ad3a99ce0b2d5ebf94f2f7504e0fdda24c81abf4
-Size (activerecord-7.0.5.gem) = 478720 bytes
+BLAKE2s (activerecord-7.0.5.1.gem) = fa3fdd2839bcaff55deeeedafc64aea47dd76e035cb0ff93c575295b44e5d8d5
+SHA512 (activerecord-7.0.5.1.gem) = 87a2da506400b767a5c654f84adb81dfdb64520b78f7fd4016e0d74a2796cdea8cbe7fdb7b1de11017a04369e4a80a26f0960d56967fcc96b122673c02b0e8a8
+Size (activerecord-7.0.5.1.gem) = 478720 bytes

devel/ruby-activejob61/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2023/03/15 13:31:48 taca Exp $
+$NetBSD: distinfo,v 1.18.4.1 2023/06/30 18:41:55 bsiegert Exp $
 
-BLAKE2s (activejob-6.1.7.3.gem) = bb105272e6ffffd74269baf157c9f6ffe92da16c262dd856fbba2938d198ae5a
-SHA512 (activejob-6.1.7.3.gem) = 92664b9bbdc128dd1931b7c42b0a11f6e45dbce42def115d89dcc874f4db88a8d42200c66bdb9e2ed9367f435a4334f02cbac8f8a52b58599d0d33359fafe328
-Size (activejob-6.1.7.3.gem) = 32768 bytes
+BLAKE2s (activejob-6.1.7.4.gem) = c34f6355e380958bfb301da5000e6d1232a9a7ca600d2daabe3a1acc90e4cb40
+SHA512 (activejob-6.1.7.4.gem) = e1b9370b43e35292e48ddba85a8d2890bb0b2e49a9078ebda8e9d0294166889d75e40b54c321da414c69e7a14789ddd0089c94d4dc75ebfd7bd2667b21631aba
+Size (activejob-6.1.7.4.gem) = 32768 bytes

devel/ruby-activejob70/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2023/05/28 01:54:17 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2023/07/03 18:39:39 bsiegert Exp $
 
-BLAKE2s (activejob-7.0.5.gem) = 34e65421620456718e2ef49646e9eb4b57549175eb7fbf2964c043370c9751c2
-SHA512 (activejob-7.0.5.gem) = 967cefeef484bd8330d0eeb7b3de4b59949ef30ea7bac182ac141ffdc74cb0b87abb812a149f404be079d9870ff7ed52d902b9d2c546f2f8ded9576747b93450
-Size (activejob-7.0.5.gem) = 33792 bytes
+BLAKE2s (activejob-7.0.5.1.gem) = 1c5bfded13d5f84190f6e1c11a0a27ac375f90458e541a114bee6d7ed2b8a940
+SHA512 (activejob-7.0.5.1.gem) = ea50739881987c5873d613ad6eb1b737c960f2bb09f31183c41a3a94e28a4a78738b5fecbbffa2f2e1cf2d662f1f3e75913177c4b09c47275f7a1b84b225dd06
+Size (activejob-7.0.5.1.gem) = 33792 bytes

devel/ruby-activemodel61/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2023/03/15 13:31:48 taca Exp $
+$NetBSD: distinfo,v 1.18.4.1 2023/06/30 18:41:55 bsiegert Exp $
 
-BLAKE2s (activemodel-6.1.7.3.gem) = ca642c5fb2fe5ae0d43c57c440189beee664e5961bffc2efcdb40f058064dfbd
-SHA512 (activemodel-6.1.7.3.gem) = 5c831ff449aa800c4b30e64a11e6eb64324516f9eda76c4bc910f50b07d19d8df725411f42dbae521bf3e7339114be602cda7404f53d203daab47aa40341aa81
-Size (activemodel-6.1.7.3.gem) = 62464 bytes
+BLAKE2s (activemodel-6.1.7.4.gem) = e67914fac8ace042d11f13447753aa0d370806a8cd5b5633b329e5ddd5e9ddf0
+SHA512 (activemodel-6.1.7.4.gem) = 15cdb6271e8c3a50ac471a8b257a848fdf1bb7faa72762bdf1758d36c3ad37f713d319e1ca1bd7b7601f30d35b6e29f5d14ab16c6c14feab6bfa1ea0307818f6
+Size (activemodel-6.1.7.4.gem) = 62464 bytes

devel/ruby-activemodel70/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2023/05/28 01:54:17 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2023/07/03 18:39:39 bsiegert Exp $
 
-BLAKE2s (activemodel-7.0.5.gem) = fdd82df164fbe8f7e6864141283f5d4f1f22c1e66fb2d545e46e2cca5af0ed4c
-SHA512 (activemodel-7.0.5.gem) = f38e3d25baa0ce802d53794bf338e6bf609dc6b0d02fba128b697ed30136a3769d70eae1a8ecfe33723576004d4ef7ca82c1175bcbdbede397e48026d355826b
-Size (activemodel-7.0.5.gem) = 61440 bytes
+BLAKE2s (activemodel-7.0.5.1.gem) = 66825a55aaf44315c749f1d3a7f912e75ffad1cd238da9e4d64a939c82349ba7
+SHA512 (activemodel-7.0.5.1.gem) = efef1454af20452979407905e161d3559381631bfd40448bb2acf96d95fb4b00414b5ad73cd1c91ba8ef0a27c74317a6e6f8656a0a6340cf50b2e81d9d49e7a1
+Size (activemodel-7.0.5.1.gem) = 61440 bytes

devel/ruby-activestorage61/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2023/03/15 13:31:48 taca Exp $
+$NetBSD: distinfo,v 1.18.4.1 2023/06/30 18:41:55 bsiegert Exp $
 
-BLAKE2s (activestorage-6.1.7.3.gem) = c572dd273d7a50acce73f0fcfde6a1ae16ce6cb9eff3869eb20fd064b4c8ad12
-SHA512 (activestorage-6.1.7.3.gem) = eaa0501415182bb0729173a747399bbc41847fb146a07e3b234d8d58cc59f9e5ecbc4d7b43371e29fd06c589d5be53954e92948be60e1425e9d8c0e1c458263e
-Size (activestorage-6.1.7.3.gem) = 57856 bytes
+BLAKE2s (activestorage-6.1.7.4.gem) = 45ee694e9e3f9e278e64f25fc88c8556000b9958939dedb7cc40dcb5b0f5780e
+SHA512 (activestorage-6.1.7.4.gem) = 270d23c846cb06f197ce4d53458f0b67e3942651aafa159e22b57a6d789ab20c1bd96073ac56f33bdc0cda7810561b800350487516561b5049ffe76fde761419
+Size (activestorage-6.1.7.4.gem) = 57856 bytes

devel/ruby-activestorage70/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2023/05/28 01:54:17 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2023/07/03 18:39:39 bsiegert Exp $
 
-BLAKE2s (activestorage-7.0.5.gem) = 9cc4c816b19bbfa50077954a1a9e2a7a072ad8ba7c705d940d47e2ffad9ede7a
-SHA512 (activestorage-7.0.5.gem) = 1bff847032cf9fd889357dec10d43a03fc1f5e13474fc4a95cd26c1e513e0a6dd5d87b201c79764303b7cba3566c3584e7dd0131112211acf50b5ae5f9339333
-Size (activestorage-7.0.5.gem) = 65536 bytes
+BLAKE2s (activestorage-7.0.5.1.gem) = 8108f9576c0a2a836f25282971b90d5c493e6b33d1c12b285bb8d9c3e7969a83
+SHA512 (activestorage-7.0.5.1.gem) = 2c29219c1287d1454729293093fd192dc18768e75c36d598cd036674739363494c5328b5506e8ce76804aa53ca3a160876cfdeb08b4544fc4b77059f32b7bb69
+Size (activestorage-7.0.5.1.gem) = 65536 bytes

devel/ruby-activesupport61/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2023/03/15 13:31:47 taca Exp $
+$NetBSD: distinfo,v 1.18.4.1 2023/06/30 18:41:55 bsiegert Exp $
 
-BLAKE2s (activesupport-6.1.7.3.gem) = 64ce29f54da07b684e2d8ad20c33a5c74d6eb44e751115824c3e100ba2c642df
-SHA512 (activesupport-6.1.7.3.gem) = 84c5d6e4ebd3e27ab3b1657968505ca8a9ac49d3d76ba55968d7d6cab4fe6b1689b80551f1343c71042255efae413e08ad9b5869e18c233a30f5acb76a7f0e6e
-Size (activesupport-6.1.7.3.gem) = 220672 bytes
+BLAKE2s (activesupport-6.1.7.4.gem) = e36c7e3cc5f1a3d95f75f2784a8f582c6a2e037c3ec9e5279482dbcc980f1800
+SHA512 (activesupport-6.1.7.4.gem) = 67f146d414b47923aaed728bdc038759ee98ea031ee0e510cfdde727f1eaa2cf4e71fa53e9a9490435dc91a94fa59c4b9a8f20554915b788557b630a6e4e0a5b
+Size (activesupport-6.1.7.4.gem) = 220672 bytes

devel/ruby-activesupport70/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2023/05/28 01:54:17 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2023/07/03 18:39:40 bsiegert Exp $
 
-BLAKE2s (activesupport-7.0.5.gem) = d1e820728307dbccc709e2641b961802fc0ac4883817fbe81e27361ec543ecb5
-SHA512 (activesupport-7.0.5.gem) = 1ea7638b6cb70b549c216b1929ef07d49ff13ad6ae07f0cf70f4947cd834c85cc4e0bc94855d2533402ae3f5ad35d5eeb46836f3ab9a0b314a279acdd610ef77
-Size (activesupport-7.0.5.gem) = 225280 bytes
+BLAKE2s (activesupport-7.0.5.1.gem) = d8ba8d516601874fe22dd51999bcba1e8fbaba5df4578dcff6bf7b1edc65facc
+SHA512 (activesupport-7.0.5.1.gem) = d14135b93983915cda57b232994ceacbf3dd91a6bc43582714346db74799da239aa261ffdddc8efe4de3750b2e9c132965e48694f560a6595f488540b4e3efa1
+Size (activesupport-7.0.5.1.gem) = 225280 bytes

devel/ruby-railties61/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2023/03/15 13:31:49 taca Exp $
+$NetBSD: distinfo,v 1.18.4.1 2023/06/30 18:41:55 bsiegert Exp $
 
-BLAKE2s (railties-6.1.7.3.gem) = dc3dc692452238e8a87fe46940bd5bd5bbf4459458b4292a7f733e5172b61101
-SHA512 (railties-6.1.7.3.gem) = ea914c0318ed8e9eca346f14d465ae053e926adf25390021980afa5b891ebb4600f71e9b390aa03602544a5db686a98f4b75c94947273bc3f196f28875b2a3a6
-Size (railties-6.1.7.3.gem) = 457216 bytes
+BLAKE2s (railties-6.1.7.4.gem) = 8d513f160581f9216d7db8ad8bd74fc0b33c614e617b0c9503480d77361dbdcb
+SHA512 (railties-6.1.7.4.gem) = 0f3bd6f7c5b10060098316591a2fa4fd7c76487693206b3ea2bec00c36307c4b01c5dddd2ad754ba4b4257d6d88e5ae2f19da47a25c7bacea9ed63f63544dea3
+Size (railties-6.1.7.4.gem) = 457216 bytes

devel/ruby-railties70/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2023/05/28 01:54:18 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2023/07/03 18:39:40 bsiegert Exp $
 
-BLAKE2s (railties-7.0.5.gem) = 803dd14444223b321681fb81ff1ab0a353adf4ce723a2cec3e8b21fd6fdf7f8b
-SHA512 (railties-7.0.5.gem) = 753e6d6e67ca002cb1e78bafe791e16c76cccf6554605d78045fef103c2f6ab7169d2afd83d544e906c699f65ec21f49759438e88362f0328a281ad84473119e
-Size (railties-7.0.5.gem) = 161280 bytes
+BLAKE2s (railties-7.0.5.1.gem) = 5ae0869f49c5d5cee8099357b8dfffbc32b474241273c660782fcced2cc3664f
+SHA512 (railties-7.0.5.1.gem) = 6f30a75e911af3589809d1327fed7a65fb7b0e661ddd8b5f601fc2466b5c5f9e0091d4ea6dd2e95d988137302aacb32a9157688eebc49972b0bcee8dc528aefa
+Size (railties-7.0.5.1.gem) = 161280 bytes

doc/CHANGES-2023

@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2023,v 1.4007 2023/06/26 08:40:55 pin Exp $
+$NetBSD: CHANGES-2023,v 1.4007.2.2 2023/08/31 10:56:05 he Exp $
 
 Changes to the packages collection and infrastructure in 2023:
 

doc/CHANGES-pkgsrc-2023Q2

@@ -0,0 +1,86 @@
+$NetBSD: CHANGES-pkgsrc-2023Q2,v 1.1.2.10 2023/08/18 18:14:01 bsiegert Exp $
+
+Changes to packages and infrastructure on the 2023Q2 branch:
+
+Pullup ticket #6766 - requested by taca
+www/ruby-rails61: security fix
+
+Pullup ticket #6767 - requested by taca
+www/ruby-rails70: security fix
+
+Pullup ticket #6773 - requested by gdt
+textproc/py-rapidfuzz: i386 build fix
+
+Pullup ticket #6768 - requested by taca
+lang/ruby30-base: security fix
+
+Pullup ticket #6769 - requested by taca
+lang/ruby31-base: security fix
+
+Pullup ticket #6770 - requested by taca
+lang/ruby32-base: security fix
+
+Pullup ticket #6771 - requested by taca
+www/ruby-actionpack52: security fix (CVE-2023-28362)
+
+Pullup ticket #6772 - requested by taca
+www/ruby-actionpack60: security fix (CVE-2023-28362)
+
+Pullup ticket #6774 - requested by nia
+databases-mariadb105-client: security fix
+databases-mariadb105-server: security fix
+
+Pullup ticket #6775 - requested by nia
+databases/mariadb106-client: security fix
+databases/mariadb106-server: security fix
+
+Pullup ticket #6777 - requested by abs
+x11/qt5-qtwebkit: build fix
+
+Pullup ticket #6778 - requested by abs
+www/arcticfox: sparc64 and alpha build fix
+
+Pullup ticket #6780 - requested by nia
+www/firefox102: security fix
+www/firefox102-l10n: dependent update
+
+Pullup ticket #6776 - requested by bsiegert
+print/ghostscript-agpl: security update
+
+Pullup ticket #6783 - requested by leot
+www/firefox102: Enable WebRTC X11 desktop capture
+
+Pullup ticket #6788 - requested by nia
+www/firefox102: security fix
+
+Pullup ticket #6781 - requested by taca
+textproc/ruby-sanitize: security fix (CVE-2023-36823)
+
+Pullup ticket #6782 - requested by taca
+net/samba4: security fix
+
+Pullup ticket #6785 - requested by taca
+lang/php80: security fix (CVE-2023-3823, CVE-2024-3824)
+
+Pullup ticket #6786 - requested by taca
+lang/php81: security fix
+
+Pullup ticket #6787 - requested by taca
+lang/php82: security fix
+
+Pullup ticket #6784 - requested by ryoon
+www/php-nextcloud: update to latest,
+required for migrating to version 27 in the next branch
+
+Pullup ticket #6789 - requested by gdt
+chat/ejabberd: functionality fix
+
+Pullup ticket #6790 - requested by gdt
+net/mosquitto: security fix
+
+Pullup ticket #6791 - requested by manu
+security/opensc: fix regression
+
+Pullup ticket #6793 - requested by nia
+graphics/tiff: build fix
+

graphics/tiff/Makefile

@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.158 2023/06/19 17:34:13 schmonz Exp $
+# $NetBSD: Makefile,v 1.158.2.1 2023/08/18 18:13:39 bsiegert Exp $
 
 VERSION_BASE=	4.5.1
 # Accomodate testing unreleased versions.
 #VERSION_RC=	rc3
 DISTNAME=	tiff-${VERSION_BASE}${VERSION_RC}
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://download.osgeo.org/libtiff/
 

graphics/tiff/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.105 2023/06/14 13:03:31 gdt Exp $
+$NetBSD: distinfo,v 1.105.2.1 2023/08/18 18:13:39 bsiegert Exp $
 
 BLAKE2s (tiff-4.5.1.tar.gz) = dab23619781a7f2ea39727f7bb80d6e97406644b3f9478bed64ab1f37ca06cce
 SHA512 (tiff-4.5.1.tar.gz) = 64ad2ae84f3cc67b9774d10cdeed41ab66cde9b50276dd4134318c963d26bea60de8c0b0297e77f47963bae163e0d28ed482fa8e809b1e0fb7b7c8a7f5a1cb9a
 Size (tiff-4.5.1.tar.gz) = 3785721 bytes
 SHA1 (patch-Makefile.in) = 7c3a6214da2d631df064893bba8809c357d856cf
+SHA1 (patch-configure) = 48c3f6103e35049e0bd4a5f32a508cd9439c1f3f

graphics/tiff/patches/patch-configure

@@ -0,0 +1,18 @@
+$NetBSD: patch-configure,v 1.6.2.2 2023/08/18 18:13:39 bsiegert Exp $
+
+NetBSD versions before 10.0 do not include liblzma.pc as part
+of the base system, so avoid problems compiling external packages
+by referring to a .pc file that doesn't exist.
+
+The dependency is still expressed through tiff_libs_private.
+
+--- configure.orig	2023-06-09 13:27:09.000000000 +0000
++++ configure
+@@ -19181,7 +19181,6 @@ $as_echo "#define LZMA_SUPPORT 1" >>conf
+ 
+   LIBS="-llzma $LIBS"
+   tiff_libs_private="-llzma ${tiff_libs_private}"
+-  tiff_requires_private="liblzma ${tiff_requires_private}"
+ 
+   if test "$HAVE_RPATH" = "yes" -a "x$with_lzma_lib_dir" != "x" ; then
+     LIBDIR="-R $with_lzma_lib_dir $LIBDIR"

lang/php/phpversion.mk

@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.401 2023/06/13 14:43:49 taca Exp $
+# $NetBSD: phpversion.mk,v 1.401.2.3 2023/08/15 18:52:58 bsiegert Exp $
 #
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
@@ -89,9 +89,9 @@ PHPVERSION_MK=	defined
 # Define each PHP's version.
 PHP56_VERSION=	5.6.40
 PHP74_VERSION=	7.4.33
-PHP80_VERSION=	8.0.29
-PHP81_VERSION=	8.1.20
-PHP82_VERSION=	8.2.7
+PHP80_VERSION=	8.0.30
+PHP81_VERSION=	8.1.22
+PHP82_VERSION=	8.2.9
 
 # Define API version or initial release of major version.
 PHP56_RELDATE=	20140828

lang/php80/distinfo

@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.30 2023/06/08 13:19:57 taca Exp $
+$NetBSD: distinfo,v 1.30.2.1 2023/08/15 18:32:22 bsiegert Exp $
 
-BLAKE2s (php-8.0.29.tar.xz) = 7ac7c572a97718f97081e9fa4230cbd9677c67d679ef1c37c2723f7ae6531ea1
-SHA512 (php-8.0.29.tar.xz) = 5f849753bbcc12e253160af072213bc1ede32e5051684129707d32fd6ce8e12867fcf7a5f6790b25071fdda0508dfffd3344e4bb850a747cb8f3c9aee970311d
-Size (php-8.0.29.tar.xz) = 10803592 bytes
+BLAKE2s (php-8.0.30.tar.xz) = f0f2a434121d5947543be269db9a6b1b33a04123663da0bf422d7efac00a3402
+SHA512 (php-8.0.30.tar.xz) = fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
+Size (php-8.0.30.tar.xz) = 10821076 bytes
 SHA1 (patch-build_libtool.m4) = e58a2bcebe9e9d7dc7255354fd9fe57878e3f8a6
-SHA1 (patch-configure) = 6c3d2537eb4d1c2ed05e8e1e411701d316c67d8b
+SHA1 (patch-configure) = 89e68737df839f4d43852a69340bcdbf66cdb964
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_enchant_enchant.c) = 74e0ec62928c84998ea41863088203f2511911fd
 SHA1 (patch-ext_openssl_openssl.c) = 6d83ad075866c90e17a8085fc7b562f33aea8583

lang/php80/patches/patch-configure

@@ -1,13 +1,13 @@
-$NetBSD: patch-configure,v 1.1 2021/03/07 13:41:36 taca Exp $
+$NetBSD: patch-configure,v 1.1.20.1 2023/08/15 18:32:22 bsiegert Exp $
 
 * Do not include "PKG_CONFIG*" in CONFIGURE_OPTIONS.
 * Don't automatically add libgcc on SunOS. Reported upstream as #75941.
 * Don't autodetect maintainer-zts.
 * The meta_ccld removal reported upstream as #75940.
 
---- configure.orig	2020-11-24 17:04:03.000000000 +0000
+--- configure.orig	2023-08-03 17:13:08.000000000 +0000
 +++ configure
-@@ -3697,6 +3697,10 @@ EOF
+@@ -4288,6 +4288,10 @@ EOF
     else
      break
     fi
@@ -18,7 +18,7 @@ $NetBSD: patch-configure,v 1.1 2021/03/07 13:41:36 taca Exp $
     $as_echo "$CURRENT_ARG \\" >>config.nice
     CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG"
    done
-@@ -5847,9 +5851,6 @@ fi
+@@ -6358,9 +6362,6 @@ fi
  case $host_alias in
    *solaris*)
      CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
@@ -28,7 +28,7 @@ $NetBSD: patch-configure,v 1.1 2021/03/07 13:41:36 taca Exp $
      ;;
    *dgux*)
      CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR"
-@@ -6883,27 +6884,6 @@ EOF
+@@ -7422,30 +7423,6 @@ EOF
      ;;
    esac
  
@@ -53,15 +53,18 @@ $NetBSD: patch-configure,v 1.1 2021/03/07 13:41:36 taca Exp $
 -
 -    fi
 -  fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-printf "%s\n" "yes" >&6; }
+-
+   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
  
-@@ -74996,7 +74976,7 @@ $as_echo "#define HAVE_TIDYBUFFIO_H 1" >
+ else
+@@ -77733,7 +77710,7 @@ printf "%s\n" "#define HAVE_TIDYBUFFIO_H
    fi
  
    TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
 -  if test "$TIDY_LIB_NAME" == 'tidyp'; then
 +  if test "$TIDY_LIB_NAME" = 'tidyp'; then
  
- $as_echo "#define HAVE_TIDYP_H 1" >>confdefs.h
+ printf "%s\n" "#define HAVE_TIDYP_H 1" >>confdefs.h
  

lang/php81/distinfo

@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.24 2023/06/09 13:18:55 taca Exp $
+$NetBSD: distinfo,v 1.24.2.1 2023/08/15 18:42:53 bsiegert Exp $
 
-BLAKE2s (php-8.1.20.tar.xz) = fff1e7a2784caad39e2ceadf63d792014db24dc0533555646422733e407da9b5
-SHA512 (php-8.1.20.tar.xz) = d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
-Size (php-8.1.20.tar.xz) = 11793228 bytes
-SHA1 (patch-build_libtool.m4) = e58a2bcebe9e9d7dc7255354fd9fe57878e3f8a6
-SHA1 (patch-configure) = e91e22267a9b7ebcc16a586ba6f325c772adb13c
+BLAKE2s (php-8.1.22.tar.xz) = bedc63f43971576a55baaffa7faaafd720c4cee88913201f90d45fb93fa21a25
+SHA512 (php-8.1.22.tar.xz) = d5848f4174f47499207451ae7a8d7c254c1f06a9b500c907f9bff3c790e4a6a417d49cabb23b6e5f370d4f515c1ca9920ef2b3584be8979413dd4085549d9a8a
+Size (php-8.1.22.tar.xz) = 11809048 bytes
+SHA1 (patch-configure) = bf9d652aa5b5509b08ce7cdb6168936ca7b80584
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_enchant_enchant.c) = 7924acc5fdadea89b3a385cf744ef982795bf89d
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd

lang/php81/patches/patch-build_libtool.m4

@@ -1,75 +0,0 @@
-$NetBSD: patch-build_libtool.m4,v 1.1 2021/11/27 07:24:43 taca Exp $
-
-Stop warnings on newer autoconf.
-
---- build/libtool.m4.orig	2021-03-02 16:37:06.000000000 +0000
-+++ build/libtool.m4
-@@ -676,8 +676,11 @@ s390*-*linux*|sparc*-*linux*)
-   CFLAGS="$CFLAGS -belf"
-   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-     [AC_LANG_SAVE
--     AC_LANG_C
--     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+     AC_LANG([C])
-+     AC_LINK_IFELSE(
-+       [AC_LANG_PROGRAM([],[])],
-+       [lt_cv_cc_needs_belf=yes],
-+       [lt_cv_cc_needs_belf=no])
-      AC_LANG_RESTORE])
-   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -1197,7 +1200,7 @@ if test "$_LT_AC_TAGVAR(lt_cv_prog_compi
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   AC_MSG_RESULT([$hard_links])
-   if test "$hard_links" = no; then
--    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
-+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-     need_locks=warn
-   fi
- else
-@@ -1924,15 +1927,15 @@ AC_ARG_WITH([tags],
- 
- if test -f "$ltmain" && test -n "$tagnames"; then
-   if test ! -f "${ofile}"; then
--    AC_MSG_WARN([output file \`$ofile' does not exist])
-+    AC_MSG_WARN([output file `$ofile' does not exist])
-   fi
- 
-   if test -z "$LTCC"; then
-     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-     if test -z "$LTCC"; then
--      AC_MSG_WARN([output file \`$ofile' does not look like a libtool script])
-+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-     else
--      AC_MSG_WARN([using \`LTCC=$LTCC', extracted from \`$ofile'])
-+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-     fi
-   fi
-   if test -z "$LTCFLAGS"; then
-@@ -1955,7 +1958,7 @@ if test -f "$ltmain" && test -n "$tagnam
- 
-     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-     then
--      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-+      AC_MSG_ERROR([tag name "$tagname" already exists])
-     fi
- 
-     # Update the list of available tags.
-@@ -2728,7 +2731,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_L
- AC_DEFUN([_LT_AC_LANG_C_CONFIG],
- [lt_save_CC="$CC"
- AC_LANG_SAVE
--AC_LANG_C
-+AC_LANG([C])
- 
- # Source file extension for C test sources.
- ac_ext=c
-@@ -2809,7 +2812,7 @@ CC="$lt_save_CC"
- AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
- [AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
-+AC_LANG([C++])
- AC_REQUIRE([AC_PROG_CXX])
- AC_REQUIRE([_LT_AC_PROG_CXXCPP])
- 

lang/php81/patches/patch-configure

@@ -1,13 +1,13 @@
-$NetBSD: patch-configure,v 1.1 2021/11/27 07:24:43 taca Exp $
+$NetBSD: patch-configure,v 1.1.14.1 2023/08/15 18:42:53 bsiegert Exp $
 
 * Do not include "PKG_CONFIG*" in CONFIGURE_OPTIONS.
 * Don't automatically add libgcc on SunOS. Reported upstream as #75941.
 * Don't autodetect maintainer-zts.
 * The meta_ccld removal reported upstream as #75940.
 
---- configure.orig	2021-10-27 00:20:44.000000000 +0000
+--- configure.orig	2023-08-01 16:16:09.000000000 +0000
 +++ configure
-@@ -4319,6 +4319,10 @@ EOF
+@@ -4324,6 +4324,10 @@ EOF
     else
      break
     fi
@@ -15,10 +15,10 @@ $NetBSD: patch-configure,v 1.1 2021/11/27 07:24:43 taca Exp $
 +       \'PKG_CONFIG\=*)	CURRENT_ARG="'PKG_CONFIG=@TOOLS_PATH.pkg-config@'";;
 +       \'PKG_CONFIG_LIBDIR\=*)	CURRENT_ARG="'PKG_CONFIG_LIBDIR=@PHP_PKGCONFIG_PATH@'";;
 +   esac
-    $as_echo "$CURRENT_ARG \\" >>config.nice
+    printf "%s\n" "$CURRENT_ARG \\" >>config.nice
     CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG"
    done
-@@ -7540,30 +7544,6 @@ EOF
+@@ -7548,30 +7552,6 @@ EOF
      ;;
    esac
  
@@ -49,7 +49,7 @@ $NetBSD: patch-configure,v 1.1 2021/11/27 07:24:43 taca Exp $
    PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
  
  else
-@@ -79589,7 +79569,7 @@ printf "%s\n" "#define HAVE_TIDYBUFFIO_H
+@@ -80278,7 +80258,7 @@ printf "%s\n" "#define HAVE_TIDYBUFFIO_H
    fi
  
    TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR

lang/php82/distinfo

@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.8 2023/06/09 13:16:03 taca Exp $
+$NetBSD: distinfo,v 1.8.2.1 2023/08/15 18:52:58 bsiegert Exp $
 
-BLAKE2s (php-8.2.7.tar.xz) = e31531a7856586707df35d8d997b8cca8179b54fd42d8bfad71e35f06e52ac6f
-SHA512 (php-8.2.7.tar.xz) = 8533c0d7b6b0cbca8d01238342edebe1f123b093ab8f3cf5efab40b133989c3288214176b9e2a213b260b07b6bf140711f9b9580c2515a093f586bedc81d8a44
-Size (php-8.2.7.tar.xz) = 12016940 bytes
-SHA1 (patch-build_libtool.m4) = e58a2bcebe9e9d7dc7255354fd9fe57878e3f8a6
-SHA1 (patch-configure) = 9e41843c0ba0420eba8974c6a5a78de314e5c988
+BLAKE2s (php-8.2.9.tar.xz) = 7156a5143373e5fc257676e8494c2a6da346b0189360831acffcd268a19471da
+SHA512 (php-8.2.9.tar.xz) = 26c53dc737d6144cc0a3ce9134f92f59eb29f62c44b7d6159b92a25bdb0fa80239d7f6b6b663adfe444e57e98b202381df9b35532f40168ea093ac56d4bced19
+Size (php-8.2.9.tar.xz) = 12035468 bytes
+SHA1 (patch-configure) = 614c907a17adb6d8145e2d6c8ab25d2e4ff8bace
 SHA1 (patch-ext_enchant_enchant.c) = 7d999de1b2fde2ea11e4a6e16e7b59c085924b9b
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_standard_php__fopen__wrapper.c) = 0a2c19c18f089448a8d842e99738b292ab9e5640

lang/php82/patches/patch-build_libtool.m4

@@ -1,75 +0,0 @@
-$NetBSD: patch-build_libtool.m4,v 1.1 2022/12/11 14:12:29 taca Exp $
-
-Stop warnings on newer autoconf.
-
---- build/libtool.m4.orig	2021-03-02 16:37:06.000000000 +0000
-+++ build/libtool.m4
-@@ -676,8 +676,11 @@ s390*-*linux*|sparc*-*linux*)
-   CFLAGS="$CFLAGS -belf"
-   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-     [AC_LANG_SAVE
--     AC_LANG_C
--     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+     AC_LANG([C])
-+     AC_LINK_IFELSE(
-+       [AC_LANG_PROGRAM([],[])],
-+       [lt_cv_cc_needs_belf=yes],
-+       [lt_cv_cc_needs_belf=no])
-      AC_LANG_RESTORE])
-   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -1197,7 +1200,7 @@ if test "$_LT_AC_TAGVAR(lt_cv_prog_compi
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   AC_MSG_RESULT([$hard_links])
-   if test "$hard_links" = no; then
--    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
-+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-     need_locks=warn
-   fi
- else
-@@ -1924,15 +1927,15 @@ AC_ARG_WITH([tags],
- 
- if test -f "$ltmain" && test -n "$tagnames"; then
-   if test ! -f "${ofile}"; then
--    AC_MSG_WARN([output file \`$ofile' does not exist])
-+    AC_MSG_WARN([output file `$ofile' does not exist])
-   fi
- 
-   if test -z "$LTCC"; then
-     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-     if test -z "$LTCC"; then
--      AC_MSG_WARN([output file \`$ofile' does not look like a libtool script])
-+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-     else
--      AC_MSG_WARN([using \`LTCC=$LTCC', extracted from \`$ofile'])
-+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-     fi
-   fi
-   if test -z "$LTCFLAGS"; then
-@@ -1955,7 +1958,7 @@ if test -f "$ltmain" && test -n "$tagnam
- 
-     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-     then
--      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-+      AC_MSG_ERROR([tag name "$tagname" already exists])
-     fi
- 
-     # Update the list of available tags.
-@@ -2728,7 +2731,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_L
- AC_DEFUN([_LT_AC_LANG_C_CONFIG],
- [lt_save_CC="$CC"
- AC_LANG_SAVE
--AC_LANG_C
-+AC_LANG([C])
- 
- # Source file extension for C test sources.
- ac_ext=c
-@@ -2809,7 +2812,7 @@ CC="$lt_save_CC"
- AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
- [AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
-+AC_LANG([C++])
- AC_REQUIRE([AC_PROG_CXX])
- AC_REQUIRE([_LT_AC_PROG_CXXCPP])
- 

lang/php82/patches/patch-configure

@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.8 2023/06/09 13:16:03 taca Exp $
+$NetBSD: patch-configure,v 1.8.2.1 2023/08/15 18:52:58 bsiegert Exp $
 
 * Do not include "PKG_CONFIG*" in CONFIGURE_OPTIONS.
 * Don't autodetect maintainer-zts.
 * Shell portability.
 
---- configure.orig	2023-06-06 21:28:56.000000000 +0000
+--- configure.orig	2023-05-09 06:25:31.000000000 +0000
 +++ configure
-@@ -3732,6 +3732,10 @@ EOF
+@@ -4323,6 +4323,10 @@ EOF
     else
      break
     fi
@@ -14,10 +14,10 @@ $NetBSD: patch-configure,v 1.8 2023/06/09 13:16:03 taca Exp $
 +       \'PKG_CONFIG\=*)	CURRENT_ARG="'PKG_CONFIG=@TOOLS_PATH.pkg-config@'";;
 +       \'PKG_CONFIG_LIBDIR\=*)	CURRENT_ARG="'PKG_CONFIG_LIBDIR=@PHP_PKGCONFIG_PATH@'";;
 +   esac
-    $as_echo "$CURRENT_ARG \\" >>config.nice
+    printf "%s\n" "$CURRENT_ARG \\" >>config.nice
     CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG"
    done
-@@ -7022,30 +7026,6 @@ EOF
+@@ -7553,30 +7557,6 @@ EOF
      ;;
    esac
  
@@ -42,18 +42,18 @@ $NetBSD: patch-configure,v 1.8 2023/06/09 13:16:03 taca Exp $
 -
 -    fi
 -  fi
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-printf "%s\n" "yes" >&6; }
 -
    PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
  
  else
-@@ -78373,7 +78353,7 @@ $as_echo "#define HAVE_TIDYBUFFIO_H 1" >
+@@ -81017,7 +80997,7 @@ printf "%s\n" "#define HAVE_TIDYBUFFIO_H
    fi
  
    TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
 -  if test "$TIDY_LIB_NAME" == 'tidyp'; then
 +  if test "$TIDY_LIB_NAME" = 'tidyp'; then
  
- $as_echo "#define HAVE_TIDYP_H 1" >>confdefs.h
+ printf "%s\n" "#define HAVE_TIDYP_H 1" >>confdefs.h
  

lang/ruby/rails.mk

@@ -1,4 +1,4 @@
-# $NetBSD: rails.mk,v 1.145 2023/05/28 01:54:17 taca Exp $
+# $NetBSD: rails.mk,v 1.145.2.2 2023/07/03 18:39:40 bsiegert Exp $
 
 .if !defined(_RUBY_RAILS_MK)
 _RUBY_RAILS_MK=	# defined
@@ -49,8 +49,8 @@ _RUBY_RAILS_MK=	# defined
 #
 RUBY_RAILS52_VERSION?=	5.2.8.1
 RUBY_RAILS60_VERSION?=	6.0.6.1
-RUBY_RAILS61_VERSION?=	6.1.7.3
-RUBY_RAILS70_VERSION?=	7.0.5
+RUBY_RAILS61_VERSION?=	6.1.7.4
+RUBY_RAILS70_VERSION?=	7.0.5.1
 
 RUBY_RAILS_ACCEPTED?=	# empty
 RUBY_RAILS_DEFAULT?=	52

lang/ruby/rubyversion.mk

@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.265 2023/05/30 15:53:27 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.265.2.3 2023/07/05 11:58:41 bsiegert Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -347,7 +347,7 @@ RUBY_TMPDIR_VER=		0.1.2
 RUBY_TRACER_VER=		0.1.1
 RUBY_TSORT_VER=			0.1.0
 RUBY_UN_VER=			0.1.0
-RUBY_URI_VER=			0.10.2
+RUBY_URI_VER=			0.10.3
 RUBY_WEAKREF_VER=		0.1.1
 RUBY_YAML_VER=			0.1.1
 RUBY_ZLIB_VER=			2.0.0
@@ -435,7 +435,7 @@ RUBY_TIMEOUT_VER=		0.2.0
 RUBY_TMPDIR_VER=		0.1.2
 RUBY_TSORT_VER=			0.1.0
 RUBY_UN_VER=			0.2.0
-RUBY_URI_VER=			0.12.1
+RUBY_URI_VER=			0.12.2
 RUBY_WEAKREF_VER=		0.1.1
 RUBY_YAML_VER=			0.2.0
 RUBY_ZLIB_VER=			2.1.1
@@ -531,7 +531,7 @@ RUBY_TIMEOUT_VER=		0.3.1
 RUBY_TMPDIR_VER=		0.1.3
 RUBY_TSORT_VER=			0.1.1
 RUBY_UN_VER=			0.2.1
-RUBY_URI_VER=			0.12.1
+RUBY_URI_VER=			0.12.2
 RUBY_WEAKREF_VER=		0.1.2
 RUBY_YAML_VER=			0.2.1
 RUBY_ZLIB_VER=			3.0.0

lang/ruby30-base/Makefile

@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2022/11/26 13:07:52 taca Exp $
+# $NetBSD: Makefile,v 1.9.6.1 2023/07/04 15:44:43 bsiegert Exp $
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 

lang/ruby30-base/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2023/04/01 09:08:51 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2023/07/04 15:44:43 bsiegert Exp $
 
 BLAKE2s (ruby-3.0.6.tar.xz) = c774fdd29b34f60212f74897455185476bc8bfad5007d1123e8d14d42f172295
 SHA512 (ruby-3.0.6.tar.xz) = abbf883cd9f3ddbd171df8f8c3cd35d930623c4c01a5e01387de0aee9811cca7604b82163e18e04f809773bf1ca5a450f13f62f3db14f191f610e116ae4fa6f8
@@ -19,5 +19,8 @@ SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3
 SHA1 (patch-lib_rubygems_installer.rb) = 03fcd57d4e7ea03cf2ffc3d219fd489e30361014
 SHA1 (patch-lib_rubygems_platform.rb) = dc4c1073ffe331c06c477ee4b281db7aeb76fa92
+SHA1 (patch-lib_uri_rfc2396__parser.rb) = a6ccd7ab379c6f2d02a5fc11ec2cf8340d2e5b51
+SHA1 (patch-lib_uri_rfc3986__parser.rb) = 2329adf39719ab0ff86ddb91295ed1b2c24152cc
+SHA1 (patch-lib_uri_version.rb) = 602c3431eafc14fe12102c9bd484450dbdfa0337
 SHA1 (patch-test_rubygems_test__gem.rb) = e624da5b9c49f9409160a7b0fdd2efad17986cab
 SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca

lang/ruby30-base/patches/patch-lib_uri_rfc2396__parser.rb

@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_uri_rfc2396__parser.rb,v 1.1.2.2 2023/07/04 15:44:43 bsiegert Exp $
+
+Fix for CVE-2023-36617 updating uri to 0.10.3.
+
+--- lib/uri/rfc2396_parser.rb.orig	2023-03-30 12:41:03.000000000 +0000
++++ lib/uri/rfc2396_parser.rb
+@@ -491,8 +491,8 @@ module URI
+       ret = {}
+ 
+       # for URI::split
+-      ret[:ABS_URI] = Regexp.new('\A\s*' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
+-      ret[:REL_URI] = Regexp.new('\A\s*' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
++      ret[:ABS_URI] = Regexp.new('\A\s*+' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
++      ret[:REL_URI] = Regexp.new('\A\s*+' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
+ 
+       # for URI::extract
+       ret[:URI_REF]     = Regexp.new(pattern[:URI_REF])

lang/ruby30-base/patches/patch-lib_uri_rfc3986__parser.rb

@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_uri_rfc3986__parser.rb,v 1.1.2.2 2023/07/04 15:44:43 bsiegert Exp $
+
+Fix for CVE-2023-36617 updating uri to 0.10.3.
+
+--- lib/uri/rfc3986_parser.rb.orig	2023-03-30 12:41:03.000000000 +0000
++++ lib/uri/rfc3986_parser.rb
+@@ -95,7 +95,7 @@ module URI
+         QUERY: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
+         FRAGMENT: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
+         OPAQUE: /\A(?:[^\/].*)?\z/,
+-        PORT: /\A[\x09\x0a\x0c\x0d ]*\d*[\x09\x0a\x0c\x0d ]*\z/,
++        PORT: /\A[\x09\x0a\x0c\x0d ]*+\d*[\x09\x0a\x0c\x0d ]*\z/,
+       }
+     end
+ 

lang/ruby30-base/patches/patch-lib_uri_version.rb

@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_uri_version.rb,v 1.1.2.2 2023/07/04 15:44:43 bsiegert Exp $
+
+Fix for CVE-2023-36617 updating uri to 0.10.3.
+
+--- lib/uri/version.rb.orig	2023-03-30 12:41:03.000000000 +0000
++++ lib/uri/version.rb
+@@ -1,6 +1,6 @@
+ module URI
+   # :stopdoc:
+-  VERSION_CODE = '001002'.freeze
++  VERSION_CODE = '001003'.freeze
+   VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
+   # :startdoc:
+ end

lang/ruby31-base/Makefile

@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2023/01/16 06:33:51 dholland Exp $
+# $NetBSD: Makefile,v 1.8.4.1 2023/07/05 11:48:45 bsiegert Exp $
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 

lang/ruby31-base/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2023/04/01 09:17:14 taca Exp $
+$NetBSD: distinfo,v 1.10.2.1 2023/07/05 11:48:45 bsiegert Exp $
 
 BLAKE2s (ruby-3.1.4.tar.xz) = cefa8daefd26c8da56db3e114f27cb1b0af8c427d4ba9b650ef60034cb7b413c
 SHA512 (ruby-3.1.4.tar.xz) = a627bb629a10750b8b2081ad451a41faea0fc85d95aa1e267e3d2a0f56a35bb58195d4a8d13bbdbd82f4197a96dae22b1cee1dfc83861ec33a67ece07aef5633
@@ -16,6 +16,9 @@ SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 0cd0816e1cd7c84c1dab1e091787c4dc38d28273
 SHA1 (patch-lib_rubygems_installer.rb) = 1c94047a24362b3597dac7ea156982a09cb93234
 SHA1 (patch-lib_rubygems_platform.rb) = ea9d0972fb788799d7d8c07b223ac75cbab23158
+SHA1 (patch-lib_uri_rfc2396__parser.rb) = 2c48e781bdad2be2416655c4d81e438136d93f19
+SHA1 (patch-lib_uri_rfc3986__parser.rb) = 8b1bba9338a0e56325140baa1f45e4ee74830aec
+SHA1 (patch-lib_uri_version.rb) = 16ef6469b63b74032a91358cdc7fd70fb5bce87a
 SHA1 (patch-template_Makefile.in) = a4b94293de165e87021b79a0a7f683ba76e168d9
 SHA1 (patch-test_rubygems_test__gem.rb) = 32f7c7d7f8a024c045d78c2bce93944fc3113d04
 SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca

lang/ruby31-base/patches/patch-lib_uri_rfc2396__parser.rb

@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_uri_rfc2396__parser.rb,v 1.1.2.2 2023/07/05 11:48:45 bsiegert Exp $
+
+Fix for CVE-2023-36617 updating uri to 0.12.2.
+
+--- lib/uri/rfc2396_parser.rb.orig	2023-03-30 10:53:51.000000000 +0000
++++ lib/uri/rfc2396_parser.rb
+@@ -497,8 +497,8 @@ module URI
+       ret = {}
+ 
+       # for URI::split
+-      ret[:ABS_URI] = Regexp.new('\A\s*' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
+-      ret[:REL_URI] = Regexp.new('\A\s*' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
++      ret[:ABS_URI] = Regexp.new('\A\s*+' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
++      ret[:REL_URI] = Regexp.new('\A\s*+' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
+ 
+       # for URI::extract
+       ret[:URI_REF]     = Regexp.new(pattern[:URI_REF])

lang/ruby31-base/patches/patch-lib_uri_rfc3986__parser.rb

@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_uri_rfc3986__parser.rb,v 1.1.2.2 2023/07/05 11:48:45 bsiegert Exp $
+
+Fix for CVE-2023-36617 updating uri to 0.12.2.
+
+--- lib/uri/rfc3986_parser.rb.orig	2023-03-30 10:53:51.000000000 +0000
++++ lib/uri/rfc3986_parser.rb
+@@ -100,7 +100,7 @@ module URI
+         QUERY: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
+         FRAGMENT: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
+         OPAQUE: /\A(?:[^\/].*)?\z/,
+-        PORT: /\A[\x09\x0a\x0c\x0d ]*\d*[\x09\x0a\x0c\x0d ]*\z/,
++        PORT: /\A[\x09\x0a\x0c\x0d ]*+\d*[\x09\x0a\x0c\x0d ]*\z/,
+       }
+     end
+ 

lang/ruby31-base/patches/patch-lib_uri_version.rb

@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_uri_version.rb,v 1.1.2.2 2023/07/05 11:48:45 bsiegert Exp $
+
+Fix for CVE-2023-36617 updating uri to 0.12.2.
+
+--- lib/uri/version.rb.orig	2023-03-30 10:53:51.000000000 +0000
++++ lib/uri/version.rb
+@@ -1,6 +1,6 @@
+ module URI
+   # :stopdoc:
+-  VERSION_CODE = '001201'.freeze
++  VERSION_CODE = '001202'.freeze
+   VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
+   # :startdoc:
+ end

lang/ruby32-base/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2023/05/30 15:54:36 taca Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2023/07/05 11:58:41 bsiegert Exp $
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 

lang/ruby32-base/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2023/04/01 09:26:57 taca Exp $
+$NetBSD: distinfo,v 1.4.2.1 2023/07/05 11:58:41 bsiegert Exp $
 
 BLAKE2s (ruby-3.2.2.tar.xz) = 880e96fbdec90238299174d0abb7be507f04b8036386d70b61769d339bb2b609
 SHA512 (ruby-3.2.2.tar.xz) = a29f24cd80f563f6368952d06d6273f7241a409fa9ab2f60e03dde2ac58ca06bee1750715b6134caebf4c061d3503446dc37a6059e19860bb0010eef34951935
@@ -16,6 +16,9 @@ SHA1 (patch-lib_rubygems_dependency__installer.rb) = 47252c99238a0d91b7d28e8287b
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 0cd0816e1cd7c84c1dab1e091787c4dc38d28273
 SHA1 (patch-lib_rubygems_installer.rb) = 1c94047a24362b3597dac7ea156982a09cb93234
 SHA1 (patch-lib_rubygems_platform.rb) = 58094b26520623f258ecf035084f4aa7226e9686
+SHA1 (patch-lib_uri_rfc2396__parser.rb) = f078cf329b50e157366225fffcb7d390c91edff7
+SHA1 (patch-lib_uri_rfc3986__parser.rb) = 2d50b1bdea0252ac92f81bb080b423de289a65bb
+SHA1 (patch-lib_uri_version.rb) = 3f8384570199b67f625a71d7f211c1d8dabde1e2
 SHA1 (patch-test_rubygems_test__gem.rb) = 32f7c7d7f8a024c045d78c2bce93944fc3113d04
 SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca
 SHA1 (patch-tool_ifchange) = 1814cd41f0b0a93b181799cb117bd1f57068cf33

lang/ruby32-base/patches/patch-lib_uri_rfc2396__parser.rb

@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_uri_rfc2396__parser.rb,v 1.1.2.2 2023/07/05 11:58:41 bsiegert Exp $
+
+Fix for CVE-2023-36617 updating uri to 0.12.2.
+
+--- lib/uri/rfc2396_parser.rb.orig	2023-03-30 11:06:29.000000000 +0000
++++ lib/uri/rfc2396_parser.rb
+@@ -497,8 +497,8 @@ module URI
+       ret = {}
+ 
+       # for URI::split
+-      ret[:ABS_URI] = Regexp.new('\A\s*' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
+-      ret[:REL_URI] = Regexp.new('\A\s*' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
++      ret[:ABS_URI] = Regexp.new('\A\s*+' + pattern[:X_ABS_URI] + '\s*\z', Regexp::EXTENDED)
++      ret[:REL_URI] = Regexp.new('\A\s*+' + pattern[:X_REL_URI] + '\s*\z', Regexp::EXTENDED)
+ 
+       # for URI::extract
+       ret[:URI_REF]     = Regexp.new(pattern[:URI_REF])

lang/ruby32-base/patches/patch-lib_uri_rfc3986__parser.rb

@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_uri_rfc3986__parser.rb,v 1.1.2.2 2023/07/05 11:58:41 bsiegert Exp $
+
+Fix for CVE-2023-36617 updating uri to 0.12.2.
+
+--- lib/uri/rfc3986_parser.rb.orig	2023-03-30 11:06:29.000000000 +0000
++++ lib/uri/rfc3986_parser.rb
+@@ -100,7 +100,7 @@ module URI
+         QUERY: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
+         FRAGMENT: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
+         OPAQUE: /\A(?:[^\/].*)?\z/,
+-        PORT: /\A[\x09\x0a\x0c\x0d ]*\d*[\x09\x0a\x0c\x0d ]*\z/,
++        PORT: /\A[\x09\x0a\x0c\x0d ]*+\d*[\x09\x0a\x0c\x0d ]*\z/,
+       }
+     end
+ 

lang/ruby32-base/patches/patch-lib_uri_version.rb

@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_uri_version.rb,v 1.1.2.2 2023/07/05 11:58:41 bsiegert Exp $
+
+Fix for CVE-2023-36617 updating uri to 0.12.2.
+
+--- lib/uri/version.rb.orig	2023-03-30 11:06:29.000000000 +0000
++++ lib/uri/version.rb
+@@ -1,6 +1,6 @@
+ module URI
+   # :stopdoc:
+-  VERSION_CODE = '001201'.freeze
++  VERSION_CODE = '001202'.freeze
+   VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
+   # :startdoc:
+ end

mail/roundcube-plugin-enigma/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2022/08/17 15:41:43 taca Exp $
+@comment $NetBSD: PLIST,v 1.5.8.1 2023/09/23 18:29:14 bsiegert Exp $
 share/examples/roundcube/plugins/enigma/config.inc.php
 share/roundcube/plugins/enigma/README
 share/roundcube/plugins/enigma/bin/import_keys.sh
@@ -97,6 +97,7 @@ share/roundcube/plugins/enigma/localization/th_TH.inc
 share/roundcube/plugins/enigma/localization/ti.inc
 share/roundcube/plugins/enigma/localization/tr_TR.inc
 share/roundcube/plugins/enigma/localization/tzl.inc
+share/roundcube/plugins/enigma/localization/ug.inc
 share/roundcube/plugins/enigma/localization/uk_UA.inc
 share/roundcube/plugins/enigma/localization/ur_PK.inc
 share/roundcube/plugins/enigma/localization/uz.inc

mail/roundcube-plugin-password/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2022/08/17 15:41:43 taca Exp $
+@comment $NetBSD: PLIST,v 1.6.8.1 2023/09/23 18:29:14 bsiegert Exp $
 share/examples/roundcube/plugins/password/config.inc.php
 share/roundcube/plugins/password/README
 share/roundcube/plugins/password/composer.json
@@ -109,6 +109,7 @@ share/roundcube/plugins/password/localization/sv_SE.inc
 share/roundcube/plugins/password/localization/th_TH.inc
 share/roundcube/plugins/password/localization/ti.inc
 share/roundcube/plugins/password/localization/tr_TR.inc
+share/roundcube/plugins/password/localization/ug.inc
 share/roundcube/plugins/password/localization/uk_UA.inc
 share/roundcube/plugins/password/localization/uz.inc
 share/roundcube/plugins/password/localization/vi_VN.inc

mail/roundcube-plugin-password/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.31 2023/01/28 13:48:40 taca Exp $
+$NetBSD: distinfo,v 1.31.4.1 2023/09/23 18:29:14 bsiegert Exp $
 
-BLAKE2s (roundcubemail-1.6.1-complete.tar.gz) = dafde904497d565587eb4ec7d21ce7a220bdaab0212206ffc034e3e54c64bc80
-SHA512 (roundcubemail-1.6.1-complete.tar.gz) = d5804e91c2da3b732cf14ad86f06099254540dd826ae5b7f14b98a7af8b90a7e9457221da2945aace8d12a60381eec85161e8bc6e0af4572b798a66cb36f2f00
-Size (roundcubemail-1.6.1-complete.tar.gz) = 5970713 bytes
+BLAKE2s (roundcubemail-1.6.3-complete.tar.gz) = 6874a24ed9ad198c2bd50e5de93ec782adad8a388d441a2348bee1f1529acae6
+SHA512 (roundcubemail-1.6.3-complete.tar.gz) = 9a44a898f8ed9a338f126af19b572b61a7b108412be5f0c445f6ff3d84636a1487cc594347629a757e2fa18fdfa2881c3dd373e2431132a906799992c935b548
+Size (roundcubemail-1.6.3-complete.tar.gz) = 6026670 bytes
 SHA1 (patch-plugins_password_helpers_passwd-expect) = 15e427a3c90bf7c0437a023b3f099abb5a139165

mail/roundcube-plugin-zipdownload/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2022/08/17 15:41:43 taca Exp $
+@comment $NetBSD: PLIST,v 1.5.8.1 2023/09/23 18:29:15 bsiegert Exp $
 share/examples/roundcube/plugins/zipdownload/config.inc.php
 share/roundcube/plugins/zipdownload/README
 share/roundcube/plugins/zipdownload/composer.json
@@ -68,6 +68,7 @@ share/roundcube/plugins/zipdownload/localization/sr_CS.inc
 share/roundcube/plugins/zipdownload/localization/sv_SE.inc
 share/roundcube/plugins/zipdownload/localization/th_TH.inc
 share/roundcube/plugins/zipdownload/localization/tr_TR.inc
+share/roundcube/plugins/zipdownload/localization/ug.inc
 share/roundcube/plugins/zipdownload/localization/uk_UA.inc
 share/roundcube/plugins/zipdownload/localization/uz.inc
 share/roundcube/plugins/zipdownload/localization/vi_VN.inc

mail/roundcube/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2023/01/28 13:48:39 taca Exp $
+# $NetBSD: Makefile,v 1.97.4.1 2023/09/23 18:29:15 bsiegert Exp $
 
 DISTNAME=	roundcubemail-${RC_VERS}
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/mail-/-/:S/-complete//}
@@ -18,7 +18,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_IDNA2>=0.1.1:../../net/pear-Net_IDNA2
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.10.0:../../mail/pear-Mail_Mime
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Auth_SASL>=1.0.6:../../mail/pear-Auth_SASL
 
-RC_SUBDIRS=	SQL bin installer plugins program skins
+RC_SUBDIRS=	SQL bin installer plugins program skins vendor
 
 .for d in ${RC_SUBDIRS}
 INSTALLATION_DIRS+=	${RCDIR}/${d}

mail/roundcube/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2023/01/28 13:48:39 taca Exp $
+# $NetBSD: Makefile.common,v 1.29.4.1 2023/09/23 18:29:15 bsiegert Exp $
 #
 # used by mail/roundcube/Makefile
 # used by mail/roundcube/plugins.mk
@@ -10,7 +10,7 @@ GITHUB_PROJECT=	roundcubemail
 GITHUB_RELEASE=	${RC_VERS}
 HOMEPAGE=	https://roundcube.net/
 
-RC_VERS=	1.6.1
+RC_VERS=	1.6.3
 
 USE_LANGUAGES=		# none
 USE_TOOLS+=		pax

mail/roundcube/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.52 2023/01/28 13:48:39 taca Exp $
+@comment $NetBSD: PLIST,v 1.52.4.1 2023/09/23 18:29:15 bsiegert Exp $
 share/doc/roundcube/CHANGELOG.md
 share/doc/roundcube/INSTALL
 share/doc/roundcube/LICENSE
@@ -285,6 +285,7 @@ share/roundcube/plugins/acl/localization/th_TH.inc
 share/roundcube/plugins/acl/localization/ti.inc
 share/roundcube/plugins/acl/localization/tr_TR.inc
 share/roundcube/plugins/acl/localization/tzl.inc
+share/roundcube/plugins/acl/localization/ug.inc
 share/roundcube/plugins/acl/localization/uk_UA.inc
 share/roundcube/plugins/acl/localization/uz.inc
 share/roundcube/plugins/acl/localization/vi_VN.inc
@@ -375,6 +376,7 @@ share/roundcube/plugins/archive/localization/ta_IN.inc
 share/roundcube/plugins/archive/localization/th_TH.inc
 share/roundcube/plugins/archive/localization/tr_TR.inc
 share/roundcube/plugins/archive/localization/tzl.inc
+share/roundcube/plugins/archive/localization/ug.inc
 share/roundcube/plugins/archive/localization/uk_UA.inc
 share/roundcube/plugins/archive/localization/uz.inc
 share/roundcube/plugins/archive/localization/vi_VN.inc
@@ -436,6 +438,7 @@ share/roundcube/plugins/attachment_reminder/localization/mk_MK.inc
 share/roundcube/plugins/attachment_reminder/localization/ml_IN.inc
 share/roundcube/plugins/attachment_reminder/localization/mn_MN.inc
 share/roundcube/plugins/attachment_reminder/localization/nb_NO.inc
+share/roundcube/plugins/attachment_reminder/localization/nl_BE.inc
 share/roundcube/plugins/attachment_reminder/localization/nl_NL.inc
 share/roundcube/plugins/attachment_reminder/localization/pl_PL.inc
 share/roundcube/plugins/attachment_reminder/localization/pt_BR.inc
@@ -448,6 +451,7 @@ share/roundcube/plugins/attachment_reminder/localization/sq_AL.inc
 share/roundcube/plugins/attachment_reminder/localization/sr_CS.inc
 share/roundcube/plugins/attachment_reminder/localization/sv_SE.inc
 share/roundcube/plugins/attachment_reminder/localization/tr_TR.inc
+share/roundcube/plugins/attachment_reminder/localization/ug.inc
 share/roundcube/plugins/attachment_reminder/localization/uk_UA.inc
 share/roundcube/plugins/attachment_reminder/localization/uz.inc
 share/roundcube/plugins/attachment_reminder/localization/vi_VN.inc
@@ -513,6 +517,7 @@ share/roundcube/plugins/emoticons/localization/sq_AL.inc
 share/roundcube/plugins/emoticons/localization/sr_CS.inc
 share/roundcube/plugins/emoticons/localization/sv_SE.inc
 share/roundcube/plugins/emoticons/localization/tr_TR.inc
+share/roundcube/plugins/emoticons/localization/ug.inc
 share/roundcube/plugins/emoticons/localization/uk_UA.inc
 share/roundcube/plugins/emoticons/localization/uz.inc
 share/roundcube/plugins/emoticons/localization/zh_CN.inc
@@ -599,6 +604,7 @@ share/roundcube/plugins/help/localization/th_TH.inc
 share/roundcube/plugins/help/localization/ti.inc
 share/roundcube/plugins/help/localization/tr_TR.inc
 share/roundcube/plugins/help/localization/tzl.inc
+share/roundcube/plugins/help/localization/ug.inc
 share/roundcube/plugins/help/localization/uk_UA.inc
 share/roundcube/plugins/help/localization/uz.inc
 share/roundcube/plugins/help/localization/vi_VN.inc
@@ -682,6 +688,7 @@ share/roundcube/plugins/hide_blockquote/localization/sv_SE.inc
 share/roundcube/plugins/hide_blockquote/localization/th_TH.inc
 share/roundcube/plugins/hide_blockquote/localization/tr_TR.inc
 share/roundcube/plugins/hide_blockquote/localization/tzl.inc
+share/roundcube/plugins/hide_blockquote/localization/ug.inc
 share/roundcube/plugins/hide_blockquote/localization/uk_UA.inc
 share/roundcube/plugins/hide_blockquote/localization/ur_PK.inc
 share/roundcube/plugins/hide_blockquote/localization/uz.inc
@@ -889,6 +896,7 @@ share/roundcube/plugins/managesieve/localization/th_TH.inc
 share/roundcube/plugins/managesieve/localization/ti.inc
 share/roundcube/plugins/managesieve/localization/tr_TR.inc
 share/roundcube/plugins/managesieve/localization/tzl.inc
+share/roundcube/plugins/managesieve/localization/ug.inc
 share/roundcube/plugins/managesieve/localization/uk_UA.inc
 share/roundcube/plugins/managesieve/localization/ur_PK.inc
 share/roundcube/plugins/managesieve/localization/uz.inc
@@ -941,6 +949,7 @@ share/roundcube/plugins/markasjunk/localization/is_IS.inc
 share/roundcube/plugins/markasjunk/localization/it_IT.inc
 share/roundcube/plugins/markasjunk/localization/ja_JP.inc
 share/roundcube/plugins/markasjunk/localization/ko_KR.inc
+share/roundcube/plugins/markasjunk/localization/ku.inc
 share/roundcube/plugins/markasjunk/localization/lt_LT.inc
 share/roundcube/plugins/markasjunk/localization/lv_LV.inc
 share/roundcube/plugins/markasjunk/localization/nb_NO.inc
@@ -953,6 +962,7 @@ share/roundcube/plugins/markasjunk/localization/sk_SK.inc
 share/roundcube/plugins/markasjunk/localization/sq_AL.inc
 share/roundcube/plugins/markasjunk/localization/sv_SE.inc
 share/roundcube/plugins/markasjunk/localization/tr_TR.inc
+share/roundcube/plugins/markasjunk/localization/ug.inc
 share/roundcube/plugins/markasjunk/localization/zh_TW.inc
 share/roundcube/plugins/markasjunk/markasjunk.js
 share/roundcube/plugins/markasjunk/markasjunk.min.js
@@ -1027,6 +1037,7 @@ share/roundcube/plugins/new_user_dialog/localization/sr_CS.inc
 share/roundcube/plugins/new_user_dialog/localization/sv_SE.inc
 share/roundcube/plugins/new_user_dialog/localization/th_TH.inc
 share/roundcube/plugins/new_user_dialog/localization/tr_TR.inc
+share/roundcube/plugins/new_user_dialog/localization/ug.inc
 share/roundcube/plugins/new_user_dialog/localization/uk_UA.inc
 share/roundcube/plugins/new_user_dialog/localization/vi_VN.inc
 share/roundcube/plugins/new_user_dialog/localization/zh_CN.inc
@@ -1105,6 +1116,7 @@ share/roundcube/plugins/newmail_notifier/localization/sv_SE.inc
 share/roundcube/plugins/newmail_notifier/localization/th_TH.inc
 share/roundcube/plugins/newmail_notifier/localization/ti.inc
 share/roundcube/plugins/newmail_notifier/localization/tr_TR.inc
+share/roundcube/plugins/newmail_notifier/localization/ug.inc
 share/roundcube/plugins/newmail_notifier/localization/uk_UA.inc
 share/roundcube/plugins/newmail_notifier/localization/uz.inc
 share/roundcube/plugins/newmail_notifier/localization/vi_VN.inc
@@ -1194,6 +1206,7 @@ share/roundcube/plugins/subscriptions_option/localization/sr_CS.inc
 share/roundcube/plugins/subscriptions_option/localization/sv_SE.inc
 share/roundcube/plugins/subscriptions_option/localization/th_TH.inc
 share/roundcube/plugins/subscriptions_option/localization/tr_TR.inc
+share/roundcube/plugins/subscriptions_option/localization/ug.inc
 share/roundcube/plugins/subscriptions_option/localization/uk_UA.inc
 share/roundcube/plugins/subscriptions_option/localization/uz.inc
 share/roundcube/plugins/subscriptions_option/localization/vi_VN.inc
@@ -1270,6 +1283,7 @@ share/roundcube/plugins/userinfo/localization/sv_SE.inc
 share/roundcube/plugins/userinfo/localization/th_TH.inc
 share/roundcube/plugins/userinfo/localization/ti.inc
 share/roundcube/plugins/userinfo/localization/tr_TR.inc
+share/roundcube/plugins/userinfo/localization/ug.inc
 share/roundcube/plugins/userinfo/localization/uk_UA.inc
 share/roundcube/plugins/userinfo/localization/uz.inc
 share/roundcube/plugins/userinfo/localization/vi_VN.inc
@@ -1343,6 +1357,7 @@ share/roundcube/plugins/vcard_attachments/localization/sr_CS.inc
 share/roundcube/plugins/vcard_attachments/localization/sv_SE.inc
 share/roundcube/plugins/vcard_attachments/localization/th_TH.inc
 share/roundcube/plugins/vcard_attachments/localization/tr_TR.inc
+share/roundcube/plugins/vcard_attachments/localization/ug.inc
 share/roundcube/plugins/vcard_attachments/localization/uk_UA.inc
 share/roundcube/plugins/vcard_attachments/localization/uz.inc
 share/roundcube/plugins/vcard_attachments/localization/vi_VN.inc
@@ -1813,6 +1828,7 @@ share/roundcube/program/localization/ja_JP/timezones.inc
 share/roundcube/program/localization/ka_GE/labels.inc
 share/roundcube/program/localization/ka_GE/messages.inc
 share/roundcube/program/localization/kab/labels.inc
+share/roundcube/program/localization/kab/messages.inc
 share/roundcube/program/localization/km_KH/labels.inc
 share/roundcube/program/localization/km_KH/messages.inc
 share/roundcube/program/localization/kn_IN/labels.inc
@@ -1905,6 +1921,9 @@ share/roundcube/program/localization/tr_TR/messages.inc
 share/roundcube/program/localization/tr_TR/timezones.inc
 share/roundcube/program/localization/tzl/labels.inc
 share/roundcube/program/localization/tzl/messages.inc
+share/roundcube/program/localization/ug/labels.inc
+share/roundcube/program/localization/ug/messages.inc
+share/roundcube/program/localization/ug/timezones.inc
 share/roundcube/program/localization/uk_UA/labels.inc
 share/roundcube/program/localization/uk_UA/messages.inc
 share/roundcube/program/localization/ur_PK/labels.inc
@@ -2010,3 +2029,391 @@ share/roundcube/skins/elastic/thumbnail.png
 share/roundcube/skins/elastic/ui.js
 share/roundcube/skins/elastic/ui.min.js
 share/roundcube/skins/elastic/watermark.html
+share/roundcube/vendor/autoload.php
+share/roundcube/vendor/bacon/bacon-qr-code/LICENSE
+share/roundcube/vendor/bacon/bacon-qr-code/README.md
+share/roundcube/vendor/bacon/bacon-qr-code/composer.json
+share/roundcube/vendor/bacon/bacon-qr-code/src/Common/BitArray.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Common/BitMatrix.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Common/BitUtils.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Common/CharacterSetEci.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Common/EcBlock.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Common/EcBlocks.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Common/ErrorCorrectionLevel.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Common/FormatInformation.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Common/Mode.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Common/ReedSolomonCodec.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Common/Version.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Encoder/BlockPair.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Encoder/ByteMatrix.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Encoder/Encoder.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Encoder/MaskUtil.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Encoder/MatrixUtil.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Encoder/QrCode.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Exception/ExceptionInterface.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Exception/InvalidArgumentException.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Exception/OutOfBoundsException.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Exception/RuntimeException.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Exception/UnexpectedValueException.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Exception/WriterException.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Color/Alpha.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Color/Cmyk.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Color/ColorInterface.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Color/Gray.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Color/Rgb.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Eye/CompositeEye.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Eye/EyeInterface.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Eye/ModuleEye.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Eye/SimpleCircleEye.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Eye/SquareEye.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Image/EpsImageBackEnd.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Image/ImageBackEndInterface.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Image/ImagickImageBackEnd.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Image/SvgImageBackEnd.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Image/TransformationMatrix.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/ImageRenderer.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Module/DotsModule.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Module/EdgeIterator/Edge.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Module/EdgeIterator/EdgeIterator.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Module/ModuleInterface.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Module/RoundnessModule.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Module/SquareModule.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Path/Close.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Path/Curve.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Path/EllipticArc.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Path/Line.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Path/Move.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Path/OperationInterface.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/Path/Path.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/PlainTextRenderer.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/RendererInterface.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/RendererStyle/EyeFill.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/RendererStyle/Fill.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/RendererStyle/Gradient.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/RendererStyle/GradientType.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Renderer/RendererStyle/RendererStyle.php
+share/roundcube/vendor/bacon/bacon-qr-code/src/Writer.php
+share/roundcube/vendor/bin/crypt-gpg-pinentry
+share/roundcube/vendor/composer/ClassLoader.php
+share/roundcube/vendor/composer/InstalledVersions.php
+share/roundcube/vendor/composer/LICENSE
+share/roundcube/vendor/composer/autoload_classmap.php
+share/roundcube/vendor/composer/autoload_files.php
+share/roundcube/vendor/composer/autoload_namespaces.php
+share/roundcube/vendor/composer/autoload_psr4.php
+share/roundcube/vendor/composer/autoload_real.php
+share/roundcube/vendor/composer/autoload_static.php
+share/roundcube/vendor/composer/include_paths.php
+share/roundcube/vendor/composer/installed.json
+share/roundcube/vendor/composer/installed.php
+share/roundcube/vendor/composer/platform_check.php
+share/roundcube/vendor/dasprid/enum/LICENSE
+share/roundcube/vendor/dasprid/enum/README.md
+share/roundcube/vendor/dasprid/enum/composer.json
+share/roundcube/vendor/dasprid/enum/src/AbstractEnum.php
+share/roundcube/vendor/dasprid/enum/src/EnumMap.php
+share/roundcube/vendor/dasprid/enum/src/Exception/CloneNotSupportedException.php
+share/roundcube/vendor/dasprid/enum/src/Exception/ExceptionInterface.php
+share/roundcube/vendor/dasprid/enum/src/Exception/ExpectationException.php
+share/roundcube/vendor/dasprid/enum/src/Exception/IllegalArgumentException.php
+share/roundcube/vendor/dasprid/enum/src/Exception/MismatchException.php
+share/roundcube/vendor/dasprid/enum/src/Exception/SerializeNotSupportedException.php
+share/roundcube/vendor/dasprid/enum/src/Exception/UnserializeNotSupportedException.php
+share/roundcube/vendor/dasprid/enum/src/NullValue.php
+share/roundcube/vendor/guzzlehttp/guzzle/CHANGELOG.md
+share/roundcube/vendor/guzzlehttp/guzzle/LICENSE
+share/roundcube/vendor/guzzlehttp/guzzle/README.md
+share/roundcube/vendor/guzzlehttp/guzzle/UPGRADING.md
+share/roundcube/vendor/guzzlehttp/guzzle/composer.json
+share/roundcube/vendor/guzzlehttp/guzzle/src/BodySummarizer.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/BodySummarizerInterface.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Client.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/ClientInterface.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/ClientTrait.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Exception/InvalidArgumentException.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Handler/HeaderProcessor.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/HandlerStack.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/MessageFormatterInterface.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Middleware.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Pool.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/RequestOptions.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/TransferStats.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/Utils.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/functions.php
+share/roundcube/vendor/guzzlehttp/guzzle/src/functions_include.php
+share/roundcube/vendor/guzzlehttp/promises/CHANGELOG.md
+share/roundcube/vendor/guzzlehttp/promises/LICENSE
+share/roundcube/vendor/guzzlehttp/promises/README.md
+share/roundcube/vendor/guzzlehttp/promises/composer.json
+share/roundcube/vendor/guzzlehttp/promises/src/AggregateException.php
+share/roundcube/vendor/guzzlehttp/promises/src/CancellationException.php
+share/roundcube/vendor/guzzlehttp/promises/src/Coroutine.php
+share/roundcube/vendor/guzzlehttp/promises/src/Create.php
+share/roundcube/vendor/guzzlehttp/promises/src/Each.php
+share/roundcube/vendor/guzzlehttp/promises/src/EachPromise.php
+share/roundcube/vendor/guzzlehttp/promises/src/FulfilledPromise.php
+share/roundcube/vendor/guzzlehttp/promises/src/Is.php
+share/roundcube/vendor/guzzlehttp/promises/src/Promise.php
+share/roundcube/vendor/guzzlehttp/promises/src/PromiseInterface.php
+share/roundcube/vendor/guzzlehttp/promises/src/PromisorInterface.php
+share/roundcube/vendor/guzzlehttp/promises/src/RejectedPromise.php
+share/roundcube/vendor/guzzlehttp/promises/src/RejectionException.php
+share/roundcube/vendor/guzzlehttp/promises/src/TaskQueue.php
+share/roundcube/vendor/guzzlehttp/promises/src/TaskQueueInterface.php
+share/roundcube/vendor/guzzlehttp/promises/src/Utils.php
+share/roundcube/vendor/guzzlehttp/psr7/CHANGELOG.md
+share/roundcube/vendor/guzzlehttp/psr7/LICENSE
+share/roundcube/vendor/guzzlehttp/psr7/README.md
+share/roundcube/vendor/guzzlehttp/psr7/composer.json
+share/roundcube/vendor/guzzlehttp/psr7/src/AppendStream.php
+share/roundcube/vendor/guzzlehttp/psr7/src/BufferStream.php
+share/roundcube/vendor/guzzlehttp/psr7/src/CachingStream.php
+share/roundcube/vendor/guzzlehttp/psr7/src/DroppingStream.php
+share/roundcube/vendor/guzzlehttp/psr7/src/Exception/MalformedUriException.php
+share/roundcube/vendor/guzzlehttp/psr7/src/FnStream.php
+share/roundcube/vendor/guzzlehttp/psr7/src/Header.php
+share/roundcube/vendor/guzzlehttp/psr7/src/HttpFactory.php
+share/roundcube/vendor/guzzlehttp/psr7/src/InflateStream.php
+share/roundcube/vendor/guzzlehttp/psr7/src/LazyOpenStream.php
+share/roundcube/vendor/guzzlehttp/psr7/src/LimitStream.php
+share/roundcube/vendor/guzzlehttp/psr7/src/Message.php
+share/roundcube/vendor/guzzlehttp/psr7/src/MessageTrait.php
+share/roundcube/vendor/guzzlehttp/psr7/src/MimeType.php
+share/roundcube/vendor/guzzlehttp/psr7/src/MultipartStream.php
+share/roundcube/vendor/guzzlehttp/psr7/src/NoSeekStream.php
+share/roundcube/vendor/guzzlehttp/psr7/src/PumpStream.php
+share/roundcube/vendor/guzzlehttp/psr7/src/Query.php
+share/roundcube/vendor/guzzlehttp/psr7/src/Request.php
+share/roundcube/vendor/guzzlehttp/psr7/src/Response.php
+share/roundcube/vendor/guzzlehttp/psr7/src/Rfc7230.php
+share/roundcube/vendor/guzzlehttp/psr7/src/ServerRequest.php
+share/roundcube/vendor/guzzlehttp/psr7/src/Stream.php
+share/roundcube/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php
+share/roundcube/vendor/guzzlehttp/psr7/src/StreamWrapper.php
+share/roundcube/vendor/guzzlehttp/psr7/src/UploadedFile.php
+share/roundcube/vendor/guzzlehttp/psr7/src/Uri.php
+share/roundcube/vendor/guzzlehttp/psr7/src/UriComparator.php
+share/roundcube/vendor/guzzlehttp/psr7/src/UriNormalizer.php
+share/roundcube/vendor/guzzlehttp/psr7/src/UriResolver.php
+share/roundcube/vendor/guzzlehttp/psr7/src/Utils.php
+share/roundcube/vendor/kolab/net_ldap3/.arcconfig
+share/roundcube/vendor/kolab/net_ldap3/LICENSE
+share/roundcube/vendor/kolab/net_ldap3/composer.json
+share/roundcube/vendor/kolab/net_ldap3/lib/Net/LDAP3.php
+share/roundcube/vendor/kolab/net_ldap3/lib/Net/LDAP3/Result.php
+share/roundcube/vendor/masterminds/html5/CREDITS
+share/roundcube/vendor/masterminds/html5/LICENSE.txt
+share/roundcube/vendor/masterminds/html5/README.md
+share/roundcube/vendor/masterminds/html5/RELEASE.md
+share/roundcube/vendor/masterminds/html5/UPGRADING.md
+share/roundcube/vendor/masterminds/html5/bin/entities.php
+share/roundcube/vendor/masterminds/html5/composer.json
+share/roundcube/vendor/masterminds/html5/src/HTML5.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Elements.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Entities.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Exception.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/InstructionProcessor.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Parser/CharacterReference.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Parser/DOMTreeBuilder.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Parser/EventHandler.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Parser/FileInputStream.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Parser/InputStream.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Parser/ParseError.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Parser/README.md
+share/roundcube/vendor/masterminds/html5/src/HTML5/Parser/Scanner.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Parser/StringInputStream.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Parser/TreeBuildingRules.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Parser/UTF8Utils.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Serializer/HTML5Entities.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Serializer/README.md
+share/roundcube/vendor/masterminds/html5/src/HTML5/Serializer/RulesInterface.php
+share/roundcube/vendor/masterminds/html5/src/HTML5/Serializer/Traverser.php
+share/roundcube/vendor/pear/auth_sasl/Auth/SASL.php
+share/roundcube/vendor/pear/auth_sasl/Auth/SASL/Anonymous.php
+share/roundcube/vendor/pear/auth_sasl/Auth/SASL/Common.php
+share/roundcube/vendor/pear/auth_sasl/Auth/SASL/CramMD5.php
+share/roundcube/vendor/pear/auth_sasl/Auth/SASL/DigestMD5.php
+share/roundcube/vendor/pear/auth_sasl/Auth/SASL/External.php
+share/roundcube/vendor/pear/auth_sasl/Auth/SASL/Login.php
+share/roundcube/vendor/pear/auth_sasl/Auth/SASL/Plain.php
+share/roundcube/vendor/pear/auth_sasl/Auth/SASL/SCRAM.php
+share/roundcube/vendor/pear/auth_sasl/README.md
+share/roundcube/vendor/pear/auth_sasl/composer.json
+share/roundcube/vendor/pear/auth_sasl/package.xml
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Action.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Action/Callback.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Action/Counter.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Action/Help.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Action/List.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Action/Password.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Action/StoreArray.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Action/StoreFalse.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Action/StoreFloat.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Action/StoreInt.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Action/StoreString.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Action/StoreTrue.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Action/Version.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Argument.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Command.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/CustomMessageProvider.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Element.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Exception.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/MessageProvider.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/MessageProvider/Default.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Option.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Outputter.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Outputter/Default.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Renderer.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Renderer/Default.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/Result.php
+share/roundcube/vendor/pear/console_commandline/Console/CommandLine/XmlParser.php
+share/roundcube/vendor/pear/console_commandline/README.rst
+share/roundcube/vendor/pear/console_commandline/composer.json
+share/roundcube/vendor/pear/console_commandline/data/xmlschema.rng
+share/roundcube/vendor/pear/console_commandline/phpunit.xml
+share/roundcube/vendor/pear/console_getopt/Console/Getopt.php
+share/roundcube/vendor/pear/console_getopt/LICENSE
+share/roundcube/vendor/pear/console_getopt/README.rst
+share/roundcube/vendor/pear/console_getopt/composer.json
+share/roundcube/vendor/pear/console_getopt/package.xml
+share/roundcube/vendor/pear/crypt_gpg/Crypt/GPG.php
+share/roundcube/vendor/pear/crypt_gpg/Crypt/GPG/Engine.php
+share/roundcube/vendor/pear/crypt_gpg/Crypt/GPG/Exceptions.php
+share/roundcube/vendor/pear/crypt_gpg/Crypt/GPG/Key.php
+share/roundcube/vendor/pear/crypt_gpg/Crypt/GPG/KeyGenerator.php
+share/roundcube/vendor/pear/crypt_gpg/Crypt/GPG/PinEntry.php
+share/roundcube/vendor/pear/crypt_gpg/Crypt/GPG/ProcessControl.php
+share/roundcube/vendor/pear/crypt_gpg/Crypt/GPG/ProcessHandler.php
+share/roundcube/vendor/pear/crypt_gpg/Crypt/GPG/Signature.php
+share/roundcube/vendor/pear/crypt_gpg/Crypt/GPG/SignatureCreationInfo.php
+share/roundcube/vendor/pear/crypt_gpg/Crypt/GPG/SubKey.php
+share/roundcube/vendor/pear/crypt_gpg/Crypt/GPG/UserId.php
+share/roundcube/vendor/pear/crypt_gpg/Crypt/GPGAbstract.php
+share/roundcube/vendor/pear/crypt_gpg/LICENSE
+share/roundcube/vendor/pear/crypt_gpg/README.md
+share/roundcube/vendor/pear/crypt_gpg/composer.json
+share/roundcube/vendor/pear/crypt_gpg/data/pinentry-cli.xml
+share/roundcube/vendor/pear/crypt_gpg/scripts/crypt-gpg-pinentry
+share/roundcube/vendor/pear/mail_mime/Mail/mime.php
+share/roundcube/vendor/pear/mail_mime/Mail/mimePart.php
+share/roundcube/vendor/pear/mail_mime/README
+share/roundcube/vendor/pear/mail_mime/composer.json
+share/roundcube/vendor/pear/net_ldap2/LICENSE
+share/roundcube/vendor/pear/net_ldap2/Net/LDAP2.php
+share/roundcube/vendor/pear/net_ldap2/Net/LDAP2/Entry.php
+share/roundcube/vendor/pear/net_ldap2/Net/LDAP2/Filter.php
+share/roundcube/vendor/pear/net_ldap2/Net/LDAP2/LDIF.php
+share/roundcube/vendor/pear/net_ldap2/Net/LDAP2/RootDSE.php
+share/roundcube/vendor/pear/net_ldap2/Net/LDAP2/Schema.php
+share/roundcube/vendor/pear/net_ldap2/Net/LDAP2/SchemaCache.interface.php
+share/roundcube/vendor/pear/net_ldap2/Net/LDAP2/Search.php
+share/roundcube/vendor/pear/net_ldap2/Net/LDAP2/SimpleFileSchemaCache.php
+share/roundcube/vendor/pear/net_ldap2/Net/LDAP2/Util.php
+share/roundcube/vendor/pear/net_ldap2/composer.json
+share/roundcube/vendor/pear/net_ldap2/package.xml
+share/roundcube/vendor/pear/net_sieve/Sieve.php
+share/roundcube/vendor/pear/net_sieve/composer.json
+share/roundcube/vendor/pear/net_smtp/LICENSE
+share/roundcube/vendor/pear/net_smtp/Net/SMTP.php
+share/roundcube/vendor/pear/net_smtp/README.rst
+share/roundcube/vendor/pear/net_smtp/composer.json
+share/roundcube/vendor/pear/net_socket/Net/Socket.php
+share/roundcube/vendor/pear/net_socket/composer.json
+share/roundcube/vendor/pear/net_socket/package.xml
+share/roundcube/vendor/pear/pear-core-minimal/README.rst
+share/roundcube/vendor/pear/pear-core-minimal/composer.json
+share/roundcube/vendor/pear/pear-core-minimal/src/OS/Guess.php
+share/roundcube/vendor/pear/pear-core-minimal/src/PEAR.php
+share/roundcube/vendor/pear/pear-core-minimal/src/PEAR/Error.php
+share/roundcube/vendor/pear/pear-core-minimal/src/PEAR/ErrorStack.php
+share/roundcube/vendor/pear/pear-core-minimal/src/System.php
+share/roundcube/vendor/pear/pear_exception/LICENSE
+share/roundcube/vendor/pear/pear_exception/PEAR/Exception.php
+share/roundcube/vendor/pear/pear_exception/composer.json
+share/roundcube/vendor/psr/http-client/CHANGELOG.md
+share/roundcube/vendor/psr/http-client/LICENSE
+share/roundcube/vendor/psr/http-client/README.md
+share/roundcube/vendor/psr/http-client/composer.json
+share/roundcube/vendor/psr/http-client/src/ClientExceptionInterface.php
+share/roundcube/vendor/psr/http-client/src/ClientInterface.php
+share/roundcube/vendor/psr/http-client/src/NetworkExceptionInterface.php
+share/roundcube/vendor/psr/http-client/src/RequestExceptionInterface.php
+share/roundcube/vendor/psr/http-factory/LICENSE
+share/roundcube/vendor/psr/http-factory/README.md
+share/roundcube/vendor/psr/http-factory/composer.json
+share/roundcube/vendor/psr/http-factory/src/RequestFactoryInterface.php
+share/roundcube/vendor/psr/http-factory/src/ResponseFactoryInterface.php
+share/roundcube/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php
+share/roundcube/vendor/psr/http-factory/src/StreamFactoryInterface.php
+share/roundcube/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
+share/roundcube/vendor/psr/http-factory/src/UriFactoryInterface.php
+share/roundcube/vendor/psr/http-message/CHANGELOG.md
+share/roundcube/vendor/psr/http-message/LICENSE
+share/roundcube/vendor/psr/http-message/README.md
+share/roundcube/vendor/psr/http-message/composer.json
+share/roundcube/vendor/psr/http-message/docs/PSR7-Interfaces.md
+share/roundcube/vendor/psr/http-message/docs/PSR7-Usage.md
+share/roundcube/vendor/psr/http-message/src/MessageInterface.php
+share/roundcube/vendor/psr/http-message/src/RequestInterface.php
+share/roundcube/vendor/psr/http-message/src/ResponseInterface.php
+share/roundcube/vendor/psr/http-message/src/ServerRequestInterface.php
+share/roundcube/vendor/psr/http-message/src/StreamInterface.php
+share/roundcube/vendor/psr/http-message/src/UploadedFileInterface.php
+share/roundcube/vendor/psr/http-message/src/UriInterface.php
+share/roundcube/vendor/ralouphie/getallheaders/LICENSE
+share/roundcube/vendor/ralouphie/getallheaders/README.md
+share/roundcube/vendor/ralouphie/getallheaders/composer.json
+share/roundcube/vendor/ralouphie/getallheaders/src/getallheaders.php
+share/roundcube/vendor/roundcube/plugin-installer/README.md
+share/roundcube/vendor/roundcube/plugin-installer/composer.json
+share/roundcube/vendor/roundcube/plugin-installer/src/Roundcube/Composer/ExtensionInstaller.php
+share/roundcube/vendor/roundcube/plugin-installer/src/Roundcube/Composer/PluginInstaller.php
+share/roundcube/vendor/roundcube/plugin-installer/src/Roundcube/Composer/RoundcubeInstaller.php
+share/roundcube/vendor/roundcube/plugin-installer/src/Roundcube/Composer/SkinInstaller.php
+share/roundcube/vendor/roundcube/rtf-html-php/CHANGELOG.md
+share/roundcube/vendor/roundcube/rtf-html-php/LICENSE
+share/roundcube/vendor/roundcube/rtf-html-php/README.md
+share/roundcube/vendor/roundcube/rtf-html-php/composer.json
+share/roundcube/vendor/roundcube/rtf-html-php/src/ControlSymbol.php
+share/roundcube/vendor/roundcube/rtf-html-php/src/ControlWord.php
+share/roundcube/vendor/roundcube/rtf-html-php/src/Document.php
+share/roundcube/vendor/roundcube/rtf-html-php/src/Element.php
+share/roundcube/vendor/roundcube/rtf-html-php/src/Group.php
+share/roundcube/vendor/roundcube/rtf-html-php/src/Html/Font.php
+share/roundcube/vendor/roundcube/rtf-html-php/src/Html/HtmlFormatter.php
+share/roundcube/vendor/roundcube/rtf-html-php/src/Html/Image.php
+share/roundcube/vendor/roundcube/rtf-html-php/src/Html/State.php
+share/roundcube/vendor/roundcube/rtf-html-php/src/Text.php
+share/roundcube/vendor/symfony/deprecation-contracts/CHANGELOG.md
+share/roundcube/vendor/symfony/deprecation-contracts/LICENSE
+share/roundcube/vendor/symfony/deprecation-contracts/README.md
+share/roundcube/vendor/symfony/deprecation-contracts/composer.json
+share/roundcube/vendor/symfony/deprecation-contracts/function.php

mail/roundcube/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.83 2023/01/28 13:48:39 taca Exp $
+$NetBSD: distinfo,v 1.83.4.1 2023/09/23 18:29:15 bsiegert Exp $
 
-BLAKE2s (roundcubemail-1.6.1-complete.tar.gz) = dafde904497d565587eb4ec7d21ce7a220bdaab0212206ffc034e3e54c64bc80
-SHA512 (roundcubemail-1.6.1-complete.tar.gz) = d5804e91c2da3b732cf14ad86f06099254540dd826ae5b7f14b98a7af8b90a7e9457221da2945aace8d12a60381eec85161e8bc6e0af4572b798a66cb36f2f00
-Size (roundcubemail-1.6.1-complete.tar.gz) = 5970713 bytes
+BLAKE2s (roundcubemail-1.6.3-complete.tar.gz) = 6874a24ed9ad198c2bd50e5de93ec782adad8a388d441a2348bee1f1529acae6
+SHA512 (roundcubemail-1.6.3-complete.tar.gz) = 9a44a898f8ed9a338f126af19b572b61a7b108412be5f0c445f6ff3d84636a1487cc594347629a757e2fa18fdfa2881c3dd373e2431132a906799992c935b548
+Size (roundcubemail-1.6.3-complete.tar.gz) = 6026670 bytes
 SHA1 (patch-config_config.inc.php.sample) = 92a48a97b16fe3f5f4b9441fce762a559d8daca7
 SHA1 (patch-program_include_iniset.php) = 8a6c13c0c87d583ed60e43c01a4173d9d802a6a1
 SHA1 (patch-program_lib_Roundcube_rcube__mime.php) = b1e9479d575b7fd61c413e2b76ee36c06ece7a5c

mail/ruby-actionmailbox61/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2023/03/15 13:31:48 taca Exp $
+$NetBSD: distinfo,v 1.18.4.1 2023/06/30 18:41:56 bsiegert Exp $
 
-BLAKE2s (actionmailbox-6.1.7.3.gem) = 5345862ad5b8b9d59f1df6c6327896aa540d3a71215f26214122651593186f7f
-SHA512 (actionmailbox-6.1.7.3.gem) = 41feedbd2cdeb55dd852a958044889fc38ae15da8f6b95273d103e7dd4615ab7c8de87c35e230bc7e3a45c554a192a77e2384e8613acfa121e5de653e03efec8
-Size (actionmailbox-6.1.7.3.gem) = 22528 bytes
+BLAKE2s (actionmailbox-6.1.7.4.gem) = 918bc242b67c96a357396a3467b115e6e62ede6d61bfeaaa1ef2d879d0d25b05
+SHA512 (actionmailbox-6.1.7.4.gem) = dde7c86546fbbdc4a93d1691b4b160e03f53af8bae2df4bea80fd170898c159b0fdd5d8f4e7587b11b354616395169d6438b1d9f107bcaf6a27df611f42529fd
+Size (actionmailbox-6.1.7.4.gem) = 22528 bytes

mail/ruby-actionmailbox70/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2023/05/28 01:54:18 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2023/07/03 18:39:40 bsiegert Exp $
 
-BLAKE2s (actionmailbox-7.0.5.gem) = 9d6d2ec0e09e444e287e61f36be13d7b31bfa733d8b11fa1ca03b52052028396
-SHA512 (actionmailbox-7.0.5.gem) = 83ddbf58a67a513f118dd2edd4122e1e8d6d7722b6d82d063999d03df54f3363ae4429ffdcc7ddc242075e0c3c9d633c6891a4093f8fd714445e21838fca664e
-Size (actionmailbox-7.0.5.gem) = 22016 bytes
+BLAKE2s (actionmailbox-7.0.5.1.gem) = 1aec1661950199917c592faab69f2925e69b51ecceb0a982cd2f02cefc66f849
+SHA512 (actionmailbox-7.0.5.1.gem) = 8bfa6b416b1abe386097afc61a7637e1c69a4f7b0fb8f3e0139bfcf8769ba401481a1b1e9c73a33f635b15c44cfe8ae46685a98fcc3ab2e8943208aa46323e96
+Size (actionmailbox-7.0.5.1.gem) = 22528 bytes

mail/ruby-actionmailer61/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2023/03/15 13:31:48 taca Exp $
+$NetBSD: distinfo,v 1.18.4.1 2023/06/30 18:41:56 bsiegert Exp $
 
-BLAKE2s (actionmailer-6.1.7.3.gem) = 8be37ed8f56843b5e8d87a6d53bc252109d7f18d09489ab56bdb899d86fd61f1
-SHA512 (actionmailer-6.1.7.3.gem) = a665455406609a106bb25305d7eb63bf825b081967add26cb885ce935206043a081cff59543728db40774993fac7ec628ad572ded1d3783fca78eac218d90f00
-Size (actionmailer-6.1.7.3.gem) = 30720 bytes
+BLAKE2s (actionmailer-6.1.7.4.gem) = ae3834ed1956101051998ea0c06467390b005737681434548b8f9d3a3c4af2c2
+SHA512 (actionmailer-6.1.7.4.gem) = 392c0df511fc2f1814fec45f90c84b755be684a49965a3419f2600321aec0ee0f3277e863fae698245849d9e37a475f7430a88c94b576e22112328a440a01a36
+Size (actionmailer-6.1.7.4.gem) = 30720 bytes

mail/ruby-actionmailer70/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2023/05/28 01:54:17 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2023/07/03 18:39:40 bsiegert Exp $
 
-BLAKE2s (actionmailer-7.0.5.gem) = 22ae5f1ceb7ce87cfb6f5ef0f46e0be24469e575f279830e119187502d28b0c6
-SHA512 (actionmailer-7.0.5.gem) = fa17080ce412af789a348f8ef567fc8d9dbe539f2fa135830eb20d39c4b8ab08bd76289b50f30c2e0b56750e1cd6a45642d25e2ab41b87f5327c9186bdff1520
-Size (actionmailer-7.0.5.gem) = 30720 bytes
+BLAKE2s (actionmailer-7.0.5.1.gem) = f221d90fed72477dc1cc52c7ce47085702f618257d502b8032325daefccb4df9
+SHA512 (actionmailer-7.0.5.1.gem) = 06061a75e5936db87b728993de810bdf990ae02a843822f6d43eb25fde12a26859626ce5251f31b41b402079a8d6a4a3a421571768e3d4f52c08328d9d6d345c
+Size (actionmailer-7.0.5.1.gem) = 30720 bytes

math/openfst/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/10/11 16:35:49 nros Exp $
+# $NetBSD: Makefile,v 1.7.6.1 2023/10/14 19:46:48 he Exp $
 
 DISTNAME=	openfst-1.8.2
 CATEGORIES=	math
@@ -16,4 +16,5 @@ GCC_REQD+=	8 # needs <charconv> for from_chars
 
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

multimedia/libva/available.mk

@@ -1,4 +1,4 @@
-# $NetBSD: available.mk,v 1.11 2017/03/17 09:10:14 maya Exp $
+# $NetBSD: available.mk,v 1.11.52.1 2023/09/23 18:11:40 bsiegert Exp $
 
 
 .include "../../mk/bsd.prefs.mk"
@@ -15,7 +15,10 @@ VAAPI_AVAILABLE=	yes
 .elif ${OPSYS} == "FreeBSD"
 VAAPI_AVAILABLE=	yes
 .elif ${OPSYS} == "NetBSD"
+# Requires xcb/dri3.h, not shipped with NetBSD 8
+.  if ${OPSYS_VERSION} > 090000 || ${X11_TYPE} == "modular"
 VAAPI_AVAILABLE=	yes
+.  endif
 .elif ${OPSYS} == "Linux"
 VAAPI_AVAILABLE=	yes
 .endif

net/drill/Makefile

@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2021/01/01 12:34:49 he Exp $
+# $NetBSD: Makefile,v 1.17.20.2 2024/02/28 08:25:12 he Exp $
 
 VERSION=	1.7.1
 DISTNAME=	ldns-${VERSION}
 PKGNAME=	drill-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/ldns/
 

net/drill/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:05:33 nia Exp $
+$NetBSD: distinfo,v 1.12.14.2 2024/02/28 08:25:12 he Exp $
 
 BLAKE2s (ldns-1.7.1.tar.gz) = 1eba67c3b9950ac569f69676ffe40962663e7a4ddd0f118f9a680a20e6c899ad
 SHA512 (ldns-1.7.1.tar.gz) = e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7

net/mosquitto/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2023/06/06 12:42:05 riastradh Exp $
+# $NetBSD: Makefile,v 1.30.2.1 2023/08/16 18:58:16 bsiegert Exp $
 
-DISTNAME=	mosquitto-2.0.15
+DISTNAME=	mosquitto-2.0.16
 CATEGORIES=	net
 MASTER_SITES=	https://mosquitto.org/files/source/
 

net/mosquitto/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2022/08/16 23:08:39 gdt Exp $
+$NetBSD: distinfo,v 1.26.8.1 2023/08/16 18:58:16 bsiegert Exp $
 
-BLAKE2s (mosquitto-2.0.15.tar.gz) = 3dd3094b16ff417032fc07738f7c3eae7dcfe40247e493db9698c1f0984d7dda
-SHA512 (mosquitto-2.0.15.tar.gz) = 8a0c58222ea0b9304e7f096f6d13965478072baf1d1c9bc931b32a33f5ea8196c2dd54bde8d83fec7ed9cd413cb5fb115ce0a6701ca20664df52fdd7ca63ddaf
-Size (mosquitto-2.0.15.tar.gz) = 792632 bytes
+BLAKE2s (mosquitto-2.0.16.tar.gz) = bfd06071982a1bcccbf9141bcd7c73186c82196245adb781020e43263a330b22
+SHA512 (mosquitto-2.0.16.tar.gz) = 9e54f0a19a68afd17ca9d0d9ba8a0220e883687312f973a64e09da216cc0ad89dab959863bf1a34f737338e97e54559e8d4eb4178fce5a7fc1e02965c499db97
+Size (mosquitto-2.0.16.tar.gz) = 795906 bytes
 SHA1 (patch-lib_CMakeLists.txt) = 81981f812dc38572e727a9a5dfb427b80476702d
 SHA1 (patch-lib_net__mosq.c) = fdf488984e3b902473f28d6e3482169788c0d517
 SHA1 (patch-lib_strings__mosq.c) = fb290d7766328d6aa1e935adec9c0fad2eb11c4b

net/samba4/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.165 2023/06/16 21:40:12 wiz Exp $
+# $NetBSD: Makefile,v 1.165.2.1 2023/08/15 18:21:21 bsiegert Exp $
 
-DISTNAME=	samba-4.18.3
+DISTNAME=	samba-4.18.5
 CATEGORIES=	net
 MASTER_SITES=	https://download.samba.org/pub/samba/stable/
 

net/samba4/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.93 2023/06/16 21:40:12 wiz Exp $
+$NetBSD: distinfo,v 1.93.2.1 2023/08/15 18:21:21 bsiegert Exp $
 
-BLAKE2s (samba-4.18.3.tar.gz) = 5cbceef6c02cbedfc24d0e74e09473a716873d1394375163a4def7a4014b78af
-SHA512 (samba-4.18.3.tar.gz) = b0980291ca124641bd03ba51d4b4e2e492facb3939f8edf491133be83a82beed66f68f00442cb02c211a9e76eb6ba08387136e30eb7df756c3c90c76034689c4
-Size (samba-4.18.3.tar.gz) = 41294739 bytes
+BLAKE2s (samba-4.18.5.tar.gz) = e7b9c7cf8adbe2c42e21d416aff8a18e7c11bcf458cc16d45747b104ed478edb
+SHA512 (samba-4.18.5.tar.gz) = c12b7cd7aba0941bf178c89604f926347bee4f5bb6ea651930cc93bcd8a2cfa983b1f10a0ccb55f99c5b34b9f158d1059d06d7f39f7bc261c7dd0d8c89c5a6f5
+Size (samba-4.18.5.tar.gz) = 41315373 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

print/ghostscript-agpl/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2023/04/26 20:58:23 wiz Exp $
+# $NetBSD: Makefile,v 1.76.2.1 2023/07/23 08:34:35 spz Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-agpl/}
@@ -102,7 +102,7 @@ post-extract:
 #  To allow outside customization, rename cidfmap
 #	 (if you look at inside of the file, it is logically empty)
 .if !empty(PKG_OPTIONS:Mdisable-compile-inits)
-	(cd ${WRKSRC}/Resource/Init/; ${MV} cidfmap cidfmap.dist)
+	cd ${WRKSRC}/Resource/Init && ${MV} cidfmap cidfmap.dist
 .endif
 
 post-install:

print/ghostscript-agpl/Makefile.common

@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.common,v 1.29 2023/04/26 19:50:51 wiz Exp $
+# $NetBSD: Makefile.common,v 1.29.2.1 2023/07/23 08:34:35 spz Exp $
 # used by print/ghostscript-agpl/Makefile
 # used by fonts/ghostscript-cidfonts-ryumin/Makefile
 
-GS_VERSION=	10.01.1
+GS_VERSION=	10.01.2

print/ghostscript-agpl/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.44 2023/04/26 19:50:51 wiz Exp $
+$NetBSD: distinfo,v 1.44.2.1 2023/07/23 08:34:35 spz Exp $
 
-BLAKE2s (ghostscript-10.01.1.tar.xz) = b3f105f36377427f24a6d0471466b854d8e6711d9e6970c6e15d385e9593acf6
-SHA512 (ghostscript-10.01.1.tar.xz) = d944be9e8aef68d1176d64c40db6fa86d55d0c9e30047f2147c02806ab61cfe9ac2cb00d4e5b218ff3c51cc6ed47ceffe1bac4dd9d4cc1760b7974f30c6c2735
-Size (ghostscript-10.01.1.tar.xz) = 67567268 bytes
+BLAKE2s (ghostscript-10.01.2.tar.xz) = f1cadb35f50bd1c86393c9edebb6771145b822b07f04fee26f39113d6723ae92
+SHA512 (ghostscript-10.01.2.tar.xz) = ee20f0e12f553a3d04578e71a0d45defebc71117ce4dc2c14043985bfe7348ad7f8b2fe98fc9b4f5b935ecb32e50dc340be67d6ef58190542ec6d0f9da1de380
+Size (ghostscript-10.01.2.tar.xz) = 67571808 bytes
 SHA1 (patch-base_gserrors_h) = 36c8fcf27fcb0bfdcc075ad96efe3e44fb727d9a
 SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516
 SHA1 (patch-base_mkromfs.c) = 9d9afbd0fbb8c70c8f4f7de3cadc5b54541f0db0

security/opensc/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2023/06/06 12:42:14 riastradh Exp $
+# $NetBSD: Makefile,v 1.40.2.1 2023/08/17 20:06:53 bsiegert Exp $
 
 DISTNAME=	opensc-0.23.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenSC/}
 
@@ -20,7 +20,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-autostart-items
 CONFIGURE_ARGS+=	--disable-cmocka
 CONFIGURE_ARGS+=	--disable-strict  # avoid -Werror
-CONFIGURE_ARGS+=	--enable-notify
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 # The stylesheets are not found without this.
 CONFIGURE_ARGS+=	--with-xsl-stylesheetsdir=${PREFIX}/share/xsl/docbook
@@ -37,7 +36,6 @@ INSTALLATION_DIRS=	${EGDIR}
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf.example ${DESTDIR}${EGDIR}/opensc.conf
 
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 # build tools for doc; should be TOOLS

security/opensc/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2023/02/21 17:23:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.14.4.1 2023/08/17 20:06:53 bsiegert Exp $
 bin/cardos-tool
 bin/cryptoflex-tool
 bin/dnie-tool
@@ -11,7 +11,7 @@ bin/netkey-tool
 bin/openpgp-tool
 bin/opensc-asn1
 bin/opensc-explorer
-bin/opensc-notify
+${NOTIFY}bin/opensc-notify
 bin/opensc-tool
 bin/piv-tool
 bin/pkcs11-register

security/opensc/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2023/02/21 17:23:07 adam Exp $
+# $NetBSD: options.mk,v 1.6.4.1 2023/08/17 20:06:53 bsiegert Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.opensc
 
@@ -6,6 +6,11 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.opensc
 # that exactly one be chosen.
 PKG_OPTIONS_REQUIRED_GROUPS=	cardreader
 PKG_OPTIONS_GROUP.cardreader=	pcsc-lite openct
+
+# The notify option will cause programs not linked with libpthread
+# to abort when loading the opensc-pkcs11.so module. The most notable
+# example of such a program is ssh(1).
+PKG_SUPPORTED_OPTIONS=		notify
 PKG_SUGGESTED_OPTIONS=		pcsc-lite
 
 .include "../../mk/bsd.options.mk"
@@ -38,3 +43,12 @@ CONFIGURE_ARGS+=	--enable-openct
 .else
 CONFIGURE_ARGS+=	--disable-openct
 .endif
+
+.if !empty(PKG_OPTIONS:Mnotify)
+.include "../../devel/glib2/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-notify
+PLIST_SUBST+=		NOTIFY=""
+.else
+CONFIGURE_ARGS+=	--disable-notify
+PLIST_SUBST+=		NOTIFY="@comment "
+.endif

sysutils/xenkernel415/Makefile

@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2022/12/15 13:24:43 bouyer Exp $
+# $NetBSD: Makefile,v 1.8.6.2 2023/09/23 18:04:05 bsiegert Exp $
 
-VERSION=	4.15.4
+VERSION=	4.15.5
 DISTNAME=	xen-${VERSION}
 PKGNAME=	xenkernel415-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://downloads.xenproject.org/release/xen/${VERSION}/
 DIST_SUBDIR=	xen415

sysutils/xenkernel415/distinfo

@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.8 2022/12/15 13:24:43 bouyer Exp $
+$NetBSD: distinfo,v 1.8.6.2 2023/09/23 18:04:05 bsiegert Exp $
 
-BLAKE2s (xen415/xen-4.15.4.tar.gz) = ff0fc8e2cd666a1361fe24d53be06dc24e50b88a2e200104d769573720e198e4
-SHA512 (xen415/xen-4.15.4.tar.gz) = fa6a4991c0699025af163ed117f8d0523c0a482102464615025eb3575d755ffacec5df394e3fe01871cde6028678f654d99f8e3c2533b138765971a2a7994cb8
-Size (xen415/xen-4.15.4.tar.gz) = 40820669 bytes
+BLAKE2s (xen415/xen-4.15.5.tar.gz) = 85bef27c99fd9fd3037ec6df5e514289b650f2f073bcc543d13d5997c03332d4
+SHA512 (xen415/xen-4.15.5.tar.gz) = 790f3d75df78f63f5b2ce3b99c1f2287f75ef5571d1b7a9bb9bac470bd28ccbd4816d07a1af8320eee4107626c75be029bd6dad1d99d58f3816906ed98d206d9
+Size (xen415/xen-4.15.5.tar.gz) = 40835793 bytes
 SHA1 (patch-Config.mk) = 9372a09efd05c9fbdbc06f8121e411fcb7c7ba65
+SHA1 (patch-XSA438) = a8288bbbe8ffe799cebbf6bb184b1a2b59b59089
 SHA1 (patch-xen_Makefile) = 465388d80de414ca3bb84faefa0f52d817e423a6
 SHA1 (patch-xen_Rules.mk) = c743dc63f51fc280d529a7d9e08650292c171dac
 SHA1 (patch-xen_arch_x86_Kconfig) = df14bfa09b9a0008ca59d53c938d43a644822dd9

sysutils/xenkernel415/patches/patch-XSA438

@@ -0,0 +1,420 @@
+$NetBSD: patch-XSA438,v 1.1.2.2 2023/09/23 18:04:05 bsiegert Exp $
+
+From: Jan Beulich <jbeulich@suse.com>
+Subject: x86/shadow: defer releasing of PV's top-level shadow reference
+
+sh_set_toplevel_shadow() re-pinning the top-level shadow we may be
+running on is not enough (and at the same time unnecessary when the
+shadow isn't what we're running on): That shadow becomes eligible for
+blowing away (from e.g. shadow_prealloc()) immediately after the
+paging lock was dropped. Yet it needs to remain valid until the actual
+page table switch occurred.
+
+Propagate up the call chain the shadow entry that needs releasing
+eventually, and carry out the release immediately after switching page
+tables. Handle update_cr3() failures by switching to idle pagetables.
+Note that various further uses of update_cr3() are HVM-only or only act
+on paused vCPU-s, in which case sh_set_toplevel_shadow() will not defer
+releasing of the reference.
+
+While changing the update_cr3() hook, also convert the "do_locking"
+parameter to boolean.
+
+This is CVE-2023-34322 / XSA-438.
+
+Reported-by: Tim Deegan <tim@xen.org>
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Reviewed-by: George Dunlap <george.dunlap@cloud.com>
+
+--- xen/arch/x86/mm/hap/hap.c.orig
++++ xen/arch/x86/mm/hap/hap.c
+@@ -728,10 +728,12 @@ static bool_t hap_invlpg(struct vcpu *v,
+     return 1;
+ }
+ 
+-static void hap_update_cr3(struct vcpu *v, int do_locking, bool noflush)
++static pagetable_t hap_update_cr3(struct vcpu *v, bool do_locking, bool noflush)
+ {
+     v->arch.hvm.hw_cr[3] = v->arch.hvm.guest_cr[3];
+     hvm_update_guest_cr3(v, noflush);
++
++    return pagetable_null();
+ }
+ 
+ /*
+--- xen/arch/x86/mm/shadow/common.c.orig
++++ xen/arch/x86/mm/shadow/common.c
+@@ -2641,13 +2641,13 @@ void shadow_update_paging_modes(struct v
+ }
+ 
+ /* Set up the top-level shadow and install it in slot 'slot' of shadow_table */
+-void sh_set_toplevel_shadow(struct vcpu *v,
+-                            unsigned int slot,
+-                            mfn_t gmfn,
+-                            unsigned int root_type,
+-                            mfn_t (*make_shadow)(struct vcpu *v,
+-                                                 mfn_t gmfn,
+-                                                 uint32_t shadow_type))
++pagetable_t sh_set_toplevel_shadow(struct vcpu *v,
++                                   unsigned int slot,
++                                   mfn_t gmfn,
++                                   unsigned int root_type,
++                                   mfn_t (*make_shadow)(struct vcpu *v,
++                                                        mfn_t gmfn,
++                                                        uint32_t shadow_type))
+ {
+     mfn_t smfn;
+     pagetable_t old_entry, new_entry;
+@@ -2704,20 +2704,37 @@ void sh_set_toplevel_shadow(struct vcpu
+                   mfn_x(gmfn), mfn_x(pagetable_get_mfn(new_entry)));
+     v->arch.paging.shadow.shadow_table[slot] = new_entry;
+ 
+-    /* Decrement the refcount of the old contents of this slot */
+-    if ( !pagetable_is_null(old_entry) )
++    /*
++     * Decrement the refcount of the old contents of this slot, unless
++     * we're still running on that shadow - in that case it'll need holding
++     * on to until the actual page table switch did occur.
++     */
++    if ( !pagetable_is_null(old_entry) && (v != current || !is_pv_domain(d)) )
+     {
+-        mfn_t old_smfn = pagetable_get_mfn(old_entry);
+-        /* Need to repin the old toplevel shadow if it's been unpinned
+-         * by shadow_prealloc(): in PV mode we're still running on this
+-         * shadow and it's not safe to free it yet. */
+-        if ( !mfn_to_page(old_smfn)->u.sh.pinned && !sh_pin(d, old_smfn) )
+-        {
+-            printk(XENLOG_G_ERR "can't re-pin %"PRI_mfn"\n", mfn_x(old_smfn));
+-            domain_crash(d);
+-        }
+-        sh_put_ref(d, old_smfn, 0);
++        sh_put_ref(d, pagetable_get_mfn(old_entry), 0);
++        old_entry = pagetable_null();
+     }
++
++    /*
++     * 2- and 3-level shadow mode is used for HVM only. Therefore we never run
++     * on such a shadow, so only call sites requesting an L4 shadow need to pay
++     * attention to the returned value.
++     */
++    ASSERT(pagetable_is_null(old_entry) || root_type == SH_type_l4_64_shadow);
++
++    return old_entry;
++}
++
++/*
++ * Helper invoked when releasing of a top-level shadow's reference was
++ * deferred in sh_set_toplevel_shadow() above.
++ */
++void shadow_put_top_level(struct domain *d, pagetable_t old_entry)
++{
++    ASSERT(!pagetable_is_null(old_entry));
++    paging_lock(d);
++    sh_put_ref(d, pagetable_get_mfn(old_entry), 0);
++    paging_unlock(d);
+ }
+ 
+ /**************************************************************************/
+--- xen/arch/x86/mm/shadow/multi.c.orig
++++ xen/arch/x86/mm/shadow/multi.c
+@@ -3604,8 +3604,8 @@ sh_detach_old_tables(struct vcpu *v)
+     }
+ }
+ 
+-static void
+-sh_update_cr3(struct vcpu *v, int do_locking, bool noflush)
++static pagetable_t
++sh_update_cr3(struct vcpu *v, bool do_locking, bool noflush)
+ /* Updates vcpu->arch.cr3 after the guest has changed CR3.
+  * Paravirtual guests should set v->arch.guest_table (and guest_table_user,
+  * if appropriate).
+@@ -3619,6 +3619,7 @@ sh_update_cr3(struct vcpu *v, int do_loc
+ {
+     struct domain *d = v->domain;
+     mfn_t gmfn;
++    pagetable_t old_entry = pagetable_null();
+ #if GUEST_PAGING_LEVELS == 3 && defined(CONFIG_HVM)
+     const guest_l3e_t *gl3e;
+     unsigned int i, guest_idx;
+@@ -3628,7 +3629,7 @@ sh_update_cr3(struct vcpu *v, int do_loc
+     if ( is_pv_domain(d) && !v->is_initialised )
+     {
+         ASSERT(v->arch.cr3 == 0);
+-        return;
++        return old_entry;
+     }
+ 
+     if ( do_locking ) paging_lock(v->domain);
+@@ -3701,11 +3702,12 @@ sh_update_cr3(struct vcpu *v, int do_loc
+ #if GUEST_PAGING_LEVELS == 4
+     if ( sh_remove_write_access(d, gmfn, 4, 0) != 0 )
+         guest_flush_tlb_mask(d, d->dirty_cpumask);
+-    sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l4_shadow, sh_make_shadow);
++    old_entry = sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l4_shadow,
++                                       sh_make_shadow);
+     if ( unlikely(pagetable_is_null(v->arch.paging.shadow.shadow_table[0])) )
+     {
+         ASSERT(d->is_dying || d->is_shutting_down);
+-        return;
++        return old_entry;
+     }
+     if ( !shadow_mode_external(d) && !is_pv_32bit_domain(d) )
+     {
+@@ -3751,26 +3753,32 @@ sh_update_cr3(struct vcpu *v, int do_loc
+                 gl2gfn = guest_l3e_get_gfn(gl3e[i]);
+                 gl2mfn = get_gfn_query_unlocked(d, gfn_x(gl2gfn), &p2mt);
+                 if ( p2m_is_ram(p2mt) )
+-                    sh_set_toplevel_shadow(v, i, gl2mfn, (i == 3)
+-                                           ? SH_type_l2h_shadow
+-                                           : SH_type_l2_shadow,
+-                                           sh_make_shadow);
++                    old_entry = sh_set_toplevel_shadow(v, i, gl2mfn,
++                                                       (i == 3
++                                                        ? SH_type_l2h_shadow
++                                                        : SH_type_l2_shadow),
++                                                       sh_make_shadow);
+                 else
+-                    sh_set_toplevel_shadow(v, i, INVALID_MFN, 0,
+-                                           sh_make_shadow);
++                    old_entry = sh_set_toplevel_shadow(v, i, INVALID_MFN, 0,
++                                                       sh_make_shadow);
+             }
+             else
+-                sh_set_toplevel_shadow(v, i, INVALID_MFN, 0, sh_make_shadow);
++                old_entry = sh_set_toplevel_shadow(v, i, INVALID_MFN, 0,
++                                                   sh_make_shadow);
++
++            ASSERT(pagetable_is_null(old_entry));
+         }
+     }
+ #elif GUEST_PAGING_LEVELS == 2
+     if ( sh_remove_write_access(d, gmfn, 2, 0) != 0 )
+         guest_flush_tlb_mask(d, d->dirty_cpumask);
+-    sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l2_shadow, sh_make_shadow);
++    old_entry = sh_set_toplevel_shadow(v, 0, gmfn, SH_type_l2_shadow,
++                                       sh_make_shadow);
++    ASSERT(pagetable_is_null(old_entry));
+     if ( unlikely(pagetable_is_null(v->arch.paging.shadow.shadow_table[0])) )
+     {
+         ASSERT(d->is_dying || d->is_shutting_down);
+-        return;
++        return old_entry;
+     }
+ #else
+ #error This should never happen
+@@ -3864,6 +3872,8 @@ sh_update_cr3(struct vcpu *v, int do_loc
+ 
+     /* Release the lock, if we took it (otherwise it's the caller's problem) */
+     if ( do_locking ) paging_unlock(v->domain);
++
++    return old_entry;
+ }
+ 
+ 
+--- xen/arch/x86/mm/shadow/none.c.orig
++++ xen/arch/x86/mm/shadow/none.c
+@@ -50,9 +50,10 @@ static unsigned long _gva_to_gfn(struct
+     return gfn_x(INVALID_GFN);
+ }
+ 
+-static void _update_cr3(struct vcpu *v, int do_locking, bool noflush)
++static pagetable_t _update_cr3(struct vcpu *v, bool do_locking, bool noflush)
+ {
+     ASSERT_UNREACHABLE();
++    return pagetable_null();
+ }
+ 
+ static void _update_paging_modes(struct vcpu *v)
+--- xen/arch/x86/mm/shadow/private.h.orig
++++ xen/arch/x86/mm/shadow/private.h
+@@ -360,13 +360,13 @@ mfn_t shadow_alloc(struct domain *d,
+ void  shadow_free(struct domain *d, mfn_t smfn);
+ 
+ /* Set up the top-level shadow and install it in slot 'slot' of shadow_table */
+-void sh_set_toplevel_shadow(struct vcpu *v,
+-                            unsigned int slot,
+-                            mfn_t gmfn,
+-                            unsigned int root_type,
+-                            mfn_t (*make_shadow)(struct vcpu *v,
+-                                                 mfn_t gmfn,
+-                                                 uint32_t shadow_type));
++pagetable_t sh_set_toplevel_shadow(struct vcpu *v,
++                                   unsigned int slot,
++                                   mfn_t gmfn,
++                                   unsigned int root_type,
++                                   mfn_t (*make_shadow)(struct vcpu *v,
++                                                        mfn_t gmfn,
++                                                        uint32_t shadow_type));
+ 
+ /* Update the shadows in response to a pagetable write from Xen */
+ int sh_validate_guest_entry(struct vcpu *v, mfn_t gmfn, void *entry, u32 size);
+--- xen/arch/x86/mm.c.orig
++++ xen/arch/x86/mm.c
+@@ -564,15 +564,12 @@ void write_ptbase(struct vcpu *v)
+  *
+  * Update ref counts to shadow tables appropriately.
+  */
+-void update_cr3(struct vcpu *v)
++pagetable_t update_cr3(struct vcpu *v)
+ {
+     mfn_t cr3_mfn;
+ 
+     if ( paging_mode_enabled(v->domain) )
+-    {
+-        paging_update_cr3(v, false);
+-        return;
+-    }
++        return paging_update_cr3(v, false);
+ 
+     if ( !(v->arch.flags & TF_kernel_mode) )
+         cr3_mfn = pagetable_get_mfn(v->arch.guest_table_user);
+@@ -580,6 +577,8 @@ void update_cr3(struct vcpu *v)
+         cr3_mfn = pagetable_get_mfn(v->arch.guest_table);
+ 
+     make_cr3(v, cr3_mfn);
++
++    return pagetable_null();
+ }
+ 
+ static inline void set_tlbflush_timestamp(struct page_info *page)
+@@ -3241,6 +3240,7 @@ int new_guest_cr3(mfn_t mfn)
+     struct domain *d = curr->domain;
+     int rc;
+     mfn_t old_base_mfn;
++    pagetable_t old_shadow;
+ 
+     if ( is_pv_32bit_domain(d) )
+     {
+@@ -3308,9 +3308,22 @@ int new_guest_cr3(mfn_t mfn)
+     if ( !VM_ASSIST(d, m2p_strict) )
+         fill_ro_mpt(mfn);
+     curr->arch.guest_table = pagetable_from_mfn(mfn);
+-    update_cr3(curr);
++    old_shadow = update_cr3(curr);
++
++    /*
++     * In shadow mode update_cr3() can fail, in which case here we're still
++     * running on the prior top-level shadow (which we're about to release).
++     * Switch to the idle page tables in such an event; the guest will have
++     * been crashed already.
++     */
++    if ( likely(!mfn_eq(pagetable_get_mfn(old_shadow),
++                        maddr_to_mfn(curr->arch.cr3 & ~X86_CR3_NOFLUSH))) )
++        write_ptbase(curr);
++    else
++        write_ptbase(idle_vcpu[curr->processor]);
+ 
+-    write_ptbase(curr);
++    if ( !pagetable_is_null(old_shadow) )
++        shadow_put_top_level(d, old_shadow);
+ 
+     if ( likely(mfn_x(old_base_mfn) != 0) )
+     {
+--- xen/arch/x86/pv/domain.c.orig
++++ xen/arch/x86/pv/domain.c
+@@ -408,10 +408,13 @@ bool __init xpti_pcid_enabled(void)
+ 
+ static void _toggle_guest_pt(struct vcpu *v)
+ {
++    bool guest_update;
++    pagetable_t old_shadow;
+     unsigned long cr3;
+ 
+     v->arch.flags ^= TF_kernel_mode;
+-    update_cr3(v);
++    guest_update = v->arch.flags & TF_kernel_mode;
++    old_shadow = update_cr3(v);
+ 
+     /*
+      * Don't flush user global mappings from the TLB. Don't tick TLB clock.
+@@ -420,13 +423,31 @@ static void _toggle_guest_pt(struct vcpu
+      * TLB flush (for just the incoming PCID), as the top level page table may
+      * have changed behind our backs. To be on the safe side, suppress the
+      * no-flush unconditionally in this case.
++     *
++     * Furthermore in shadow mode update_cr3() can fail, in which case here
++     * we're still running on the prior top-level shadow (which we're about
++     * to release). Switch to the idle page tables in such an event; the
++     * guest will have been crashed already.
+      */
+     cr3 = v->arch.cr3;
+     if ( shadow_mode_enabled(v->domain) )
++    {
+         cr3 &= ~X86_CR3_NOFLUSH;
++
++        if ( unlikely(mfn_eq(pagetable_get_mfn(old_shadow),
++                             maddr_to_mfn(cr3))) )
++        {
++            cr3 = idle_vcpu[v->processor]->arch.cr3;
++            /* Also suppress runstate/time area updates below. */
++            guest_update = false;
++        }
++    }
+     write_cr3(cr3);
+ 
+-    if ( !(v->arch.flags & TF_kernel_mode) )
++    if ( !pagetable_is_null(old_shadow) )
++        shadow_put_top_level(v->domain, old_shadow);
++
++    if ( !guest_update )
+         return;
+ 
+     if ( v->arch.pv.need_update_runstate_area && update_runstate_area(v) )
+--- xen/include/asm-x86/mm.h.orig
++++ xen/include/asm-x86/mm.h
+@@ -569,7 +569,7 @@ void audit_domains(void);
+ #endif
+ 
+ void make_cr3(struct vcpu *v, mfn_t mfn);
+-void update_cr3(struct vcpu *v);
++pagetable_t update_cr3(struct vcpu *v);
+ int vcpu_destroy_pagetables(struct vcpu *);
+ void *do_page_walk(struct vcpu *v, unsigned long addr);
+ 
+--- xen/include/asm-x86/paging.h.orig
++++ xen/include/asm-x86/paging.h
+@@ -136,7 +136,7 @@ struct paging_mode {
+                                             unsigned long cr3,
+                                             paddr_t ga, uint32_t *pfec,
+                                             unsigned int *page_order);
+-    void          (*update_cr3            )(struct vcpu *v, int do_locking,
++    pagetable_t   (*update_cr3            )(struct vcpu *v, bool do_locking,
+                                             bool noflush);
+     void          (*update_paging_modes   )(struct vcpu *v);
+     bool          (*flush_tlb             )(bool (*flush_vcpu)(void *ctxt,
+@@ -309,9 +309,9 @@ static inline unsigned long paging_ga_to
+ /* Update all the things that are derived from the guest's CR3.
+  * Called when the guest changes CR3; the caller can then use v->arch.cr3
+  * as the value to load into the host CR3 to schedule this vcpu */
+-static inline void paging_update_cr3(struct vcpu *v, bool noflush)
++static inline pagetable_t paging_update_cr3(struct vcpu *v, bool noflush)
+ {
+-    paging_get_hostmode(v)->update_cr3(v, 1, noflush);
++    return paging_get_hostmode(v)->update_cr3(v, 1, noflush);
+ }
+ 
+ /* Update all the things that are derived from the guest's CR0/CR3/CR4.
+--- xen/include/asm-x86/shadow.h.orig
++++ xen/include/asm-x86/shadow.h
+@@ -97,6 +97,9 @@ void shadow_blow_tables_per_domain(struc
+ int shadow_set_allocation(struct domain *d, unsigned int pages,
+                           bool *preempted);
+ 
++/* Helper to invoke for deferred releasing of a top-level shadow's reference. */
++void shadow_put_top_level(struct domain *d, pagetable_t old);
++
+ #else /* !CONFIG_SHADOW_PAGING */
+ 
+ #define shadow_vcpu_teardown(v) ASSERT(is_pv_vcpu(v))
+@@ -118,6 +121,11 @@ static inline void shadow_prepare_page_t
+ 
+ static inline void shadow_blow_tables_per_domain(struct domain *d) {}
+ 
++static inline void shadow_put_top_level(struct domain *d, pagetable_t old)
++{
++    ASSERT_UNREACHABLE();
++}
++
+ static inline int shadow_domctl(struct domain *d,
+                                 struct xen_domctl_shadow_op *sc,
+                                 XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)

sysutils/xentools415/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/06/06 12:42:24 riastradh Exp $
+# $NetBSD: Makefile,v 1.24.2.1 2023/09/23 17:55:51 bsiegert Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 .include        "version.mk"

sysutils/xentools415/distinfo

@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.12 2022/12/15 13:24:44 bouyer Exp $
+$NetBSD: distinfo,v 1.12.6.1 2023/09/23 17:55:51 bsiegert Exp $
 
 BLAKE2s (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 67ded947316100f4f66fa61fe156baf1620db575450f4dc0dd8dcb323e57970b
 SHA512 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = d888e0e653727ee9895fa866d8895e6d23a568b4e9e8439db4c4d790996700c60b0655e3a3129e599736ec2b4f7b987ce79d625ba208f06665fced8bddf94403
 Size (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 3937560 bytes
-BLAKE2s (xen415/seabios-1.14.0.tar.gz) = c34103500436ad4726f15f2ed181205736143fc41af5c4b32a7055cd021edc1d
-SHA512 (xen415/seabios-1.14.0.tar.gz) = f282175484c99488f4349ff4d3af9a74d96df3e8dcbe679fcea5b8b559f95f600756939d99d6e61dabace206d3d9ccefdc8fa2bc7709d34d6a0dc085d6c79238
-Size (xen415/seabios-1.14.0.tar.gz) = 628981 bytes
-BLAKE2s (xen415/xen-4.15.4.tar.gz) = ff0fc8e2cd666a1361fe24d53be06dc24e50b88a2e200104d769573720e198e4
-SHA512 (xen415/xen-4.15.4.tar.gz) = fa6a4991c0699025af163ed117f8d0523c0a482102464615025eb3575d755ffacec5df394e3fe01871cde6028678f654d99f8e3c2533b138765971a2a7994cb8
-Size (xen415/xen-4.15.4.tar.gz) = 40820669 bytes
-SHA1 (patch-.._seabios-rel-1.14.0_src_string.c) = 87e2e28fe47c196e74fea073c7e7f7d03990fbe3
+BLAKE2s (xen415/seabios-1.16.0.tar.gz) = 490e358ef7788a08d928e0f599cbafa2b6a5182003ff3dee8ede8252983a92b6
+SHA512 (xen415/seabios-1.16.0.tar.gz) = bc4a674ff62b84d5643814c46f965c39e417d91610ea95503496cb9d6942075e71f256e5e354cd795cc618714d973203e06f1f32a0b479f1ee045175d9d74c39
+Size (xen415/seabios-1.16.0.tar.gz) = 635418 bytes
+BLAKE2s (xen415/xen-4.15.5.tar.gz) = 85bef27c99fd9fd3037ec6df5e514289b650f2f073bcc543d13d5997c03332d4
+SHA512 (xen415/xen-4.15.5.tar.gz) = 790f3d75df78f63f5b2ce3b99c1f2287f75ef5571d1b7a9bb9bac470bd28ccbd4816d07a1af8320eee4107626c75be029bd6dad1d99d58f3816906ed98d206d9
+Size (xen415/xen-4.15.5.tar.gz) = 40835793 bytes
+SHA1 (patch-.._seabios-rel-1.16.0_src_string.c) = e82f2f16a236a3b878c07b4fb655998591717a73
 SHA1 (patch-Config.mk) = d108a1743b5b5313d3ea957b02a005b49f5b3bf6
 SHA1 (patch-Makefile) = 6c580cbea532d08a38cf5e54228bd0210a98da21
 SHA1 (patch-docs_man_xl.1.pod.in) = 280a3717b9f15578d90f85392249ef97844b6765
@@ -21,7 +21,7 @@ SHA1 (patch-tools_Makefile) = 65dcdf590339717db22fd89fadab3aaa68d9b6a4
 SHA1 (patch-tools_configure) = 93cb52d3d650aa9b04b4eb0a00f8fa51c46b81ce
 SHA1 (patch-tools_console_daemon_utils.c) = ea0f66a3edbf6cb643580d0fae190064c0cbf0e0
 SHA1 (patch-tools_examples_Makefile) = d43095ab76444fd16a6f63b93fc68606452fb893
-SHA1 (patch-tools_firmware_Makefile) = e3394f66acc09f166cf2ba5e66b9dc3fdedbbabf
+SHA1 (patch-tools_firmware_Makefile) = 146998d40fbf2817e8764e6149df581a69ad5dcc
 SHA1 (patch-tools_firmware_etherboot_Makefile) = 61741d59c72430d53682ea83deed91ee4ff3d220
 SHA1 (patch-tools_hotplug_NetBSD_Makefile) = c032af025b18e888019247c47016dcf649c4f391
 SHA1 (patch-tools_hotplug_NetBSD_block) = 23a18f1ebfa3bc4a689707fd5c8afa07fa232bee

sysutils/xentools415/patches/patch-.._seabios-rel-1.16.0_src_string.c

@@ -1,12 +1,12 @@
-$NetBSD: patch-.._seabios-rel-1.14.0_src_string.c,v 1.1 2021/04/18 12:31:26 bouyer Exp $
+$NetBSD: patch-.._seabios-rel-1.16.0_src_string.c,v 1.1.2.2 2023/09/23 17:55:51 bsiegert Exp $
 
 when the code is compiled -fwhole-program, memcpy() will be ommitted by gcc
 because nothing in the file references it. Later the link fails with
 undefined references to memcpy().
 Force the inclusion with (externally_visible) attribute
 
---- ../seabios-rel-1.14.0/src/string.c.orig	2021-04-17 22:32:25.409876075 +0200
-+++ ../seabios-rel-1.14.0/src/string.c	2021-04-17 22:32:39.873615679 +0200
+--- ../seabios-rel-1.16.0/src/string.c.orig	2021-04-17 22:32:25.409876075 +0200
++++ ../seabios-rel-1.16.0/src/string.c	2021-04-17 22:32:39.873615679 +0200
 @@ -149,7 +149,7 @@
          memcpy(d_fl, s_fl, len);
  }

sysutils/xentools415/patches/patch-tools_firmware_Makefile

@@ -1,4 +1,4 @@
-$NetBSD: patch-tools_firmware_Makefile,v 1.1 2021/04/18 12:31:26 bouyer Exp $
+$NetBSD: patch-tools_firmware_Makefile,v 1.1.18.1 2023/09/23 17:55:51 bsiegert Exp $
 
 --- tools/firmware/Makefile.orig	2020-05-14 14:19:32.000000000 +0200
 +++ tools/firmware/Makefile	2020-08-26 19:39:04.950176746 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-tools_firmware_Makefile,v 1.1 2021/04/18 12:31:26 bouyer Exp $
  
  seabios-dir:
 -	GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_REVISION) seabios-dir
-+	ln -sf ../../../seabios-rel-1.14.0 ${WRKSRC}/tools/firmware/seabios-dir
++	ln -sf ../../../seabios-rel-1.16.0 ${WRKSRC}/tools/firmware/seabios-dir
  	cp seabios-config seabios-dir/.config;
  	$(MAKE) -C seabios-dir olddefconfig CC=$(SEABIOSCC) LD=$(SEABIOSLD)
  	rm -f seabios-dir/.version

sysutils/xentools415/version.mk

@@ -1,8 +1,8 @@
-# $NetBSD: version.mk,v 1.3 2022/12/15 13:24:44 bouyer Exp $
+# $NetBSD: version.mk,v 1.3.6.1 2023/09/23 17:55:51 bsiegert Exp $
 #
 # Version number is used by xentools415 and xenstoretools
 
-VERSION=	4.15.4
+VERSION=	4.15.5
 
 DIST_SUBDIR=		xen415
 DISTNAME=		xen-${VERSION}
@@ -14,7 +14,7 @@ IPXE_DIST=		ipxe-${IPXE_VERSION}.tar.gz
 DISTFILES+=		${IPXE_DIST}
 SITES.${IPXE_DIST}=	-https://github.com/ipxe/ipxe/archive/${IPXE_VERSION}.tar.gz
 
-SEABIOS_VERSION=	1.14.0
+SEABIOS_VERSION=	1.16.0
 SEABIOS_DIST=		seabios-${SEABIOS_VERSION}.tar.gz
 DISTFILES+=		${SEABIOS_DIST}
 SITES.${SEABIOS_DIST}=	-http://xenbits.xen.org/gitweb/?p=seabios.git;a=snapshot;h=refs/tags/rel-${SEABIOS_VERSION};sf=tgz

textproc/cjose/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2020/01/18 21:48:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.3.28.1 2023/08/26 14:57:22 bsiegert Exp $
 
-DISTNAME=	cjose-0.6.1
-PKGREVISION=	1
+DISTNAME=	cjose-0.6.2.2
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GITHUB:=cisco/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenIDC/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/cisco/cjose/

textproc/cjose/distinfo

@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:21:47 nia Exp $
+$NetBSD: distinfo,v 1.3.14.1 2023/08/26 14:57:22 bsiegert Exp $
 
-BLAKE2s (cjose-0.6.1.tar.gz) = 84b0ecf6349b5c38f90b4bb4017b7e13508b5e30a51869877d08b964d31b0e85
-SHA512 (cjose-0.6.1.tar.gz) = 7ae67a6d19591b3d19b888270ec0ca17df399bea117e42686fc1de39b3741ed9a8816f96d33d090687c49c3123cdc95430a781835a525a02d22561ebf5aaa653
-Size (cjose-0.6.1.tar.gz) = 1586963 bytes
+BLAKE2s (cjose-0.6.2.2.tar.gz) = 08f6e34b02ffe9dace8413c131db10a9e074900c684d2c44f8216beb532c30f5
+SHA512 (cjose-0.6.2.2.tar.gz) = 71a087709816f0aac060a7c5f037068e981366b1809f6ee32e39eaded02ad8be061b0e2fa5093515a8acec10c7f4aca232281004426221b4b7e5edbd203eb49c
+Size (cjose-0.6.2.2.tar.gz) = 498461 bytes
+SHA1 (patch-src_concatkdf.c) = 730001ddc2c0020f560fd8235b076cc262856edb

textproc/cjose/patches/patch-src_concatkdf.c

@@ -0,0 +1,19 @@
+$NetBSD$
+
+Fix build on NetBSD.
+
+--- src/concatkdf.c.orig	2023-08-22 12:18:03.202602223 +0200
++++ src/concatkdf.c	2023-08-22 12:17:49.008381386 +0200
+@@ -12,8 +12,12 @@
+ #include <malloc.h>
+ #else
+ #include <arpa/inet.h>
++#ifdef __NetBSD__
++#include <stdlib.h>
++#else
+ #include <alloca.h>
+ #endif
++#endif
+ #include <openssl/evp.h>
+ #include <string.h>
+ #include <cjose/base64.h>

textproc/py-rapidfuzz/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/06/25 23:42:14 gdt Exp $
+# $NetBSD: Makefile,v 1.10.2.3 2023/07/03 20:57:52 bsiegert Exp $
 
 DISTNAME=	rapidfuzz-3.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -21,7 +21,9 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 PLIST_SUBST+=	PYTHON_VERSION=${_PYTHON_VERSION}
 PLIST_VARS+=	avx2
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+# Only x86_64 is guaranteed to have avx2; while some i386 CPUs do, our
+# build target does not.
+.if ${MACHINE_ARCH} == "x86_64"
 PLIST.avx2=	yes
 .endif
 

textproc/ruby-actiontext61/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2023/03/15 13:31:49 taca Exp $
+$NetBSD: distinfo,v 1.18.4.1 2023/06/30 18:41:56 bsiegert Exp $
 
-BLAKE2s (actiontext-6.1.7.3.gem) = 7cb4aa87abacfd0e5fa2f62ff6198f04bfb56611d4289553298efe12fe003f1f
-SHA512 (actiontext-6.1.7.3.gem) = 476fa343a3727c93e6b763bdbfce8858f409c4141e73f104061077db2f8085df8fa20c611c3c37fa5093f4b03ccecd521d993ca136838e75de36cbcc367b90e5
-Size (actiontext-6.1.7.3.gem) = 19456 bytes
+BLAKE2s (actiontext-6.1.7.4.gem) = 444d7a1d7a2957f6f03e30ae7ed6b9e292906aaade6dcf4f4c4ef6692d17e4ca
+SHA512 (actiontext-6.1.7.4.gem) = 775862a453965ddd689b2763b751c7c63c75ae3f60f88e8a165a3c5aef707e34ef598bff370c6a11982187d2e19d1fc2b022921280dfc31d98bcac41b7e0fca5
+Size (actiontext-6.1.7.4.gem) = 19456 bytes

textproc/ruby-actiontext70/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2023/05/28 01:54:18 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2023/07/03 18:39:40 bsiegert Exp $
 
-BLAKE2s (actiontext-7.0.5.gem) = 2ae723e5d0adac73bd24114b328ddc67176a6c337ffbe37c1ab0d9c29718c6c4
-SHA512 (actiontext-7.0.5.gem) = 1c7bd575bf0e557cc708e517906e9413890a6f601f48c56c2667ab5ed05f4bc03d564b8c25419c2ecc738d5998e4a794a38189df1796203d438ac625a6a760fd
-Size (actiontext-7.0.5.gem) = 92160 bytes
+BLAKE2s (actiontext-7.0.5.1.gem) = 3cfb73ef99562dc1c7652e71ef16c4164309d5484b7719032044e34cacef8b5d
+SHA512 (actiontext-7.0.5.1.gem) = 04436d46a01f476dbcc2c8c4daa3468098d195e59ffe2892ed64da9ac75e6c76572cefc65cb60503a0d4de911c3c76afb7d8960b61010e4bd3edffe7853571ea
+Size (actiontext-7.0.5.1.gem) = 92160 bytes

textproc/ruby-sanitize/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2023/02/04 13:33:10 taca Exp $
+# $NetBSD: Makefile,v 1.2.4.1 2023/08/13 09:03:45 bsiegert Exp $
 
-DISTNAME=	sanitize-6.0.1
+DISTNAME=	sanitize-6.0.2
 CATEGORIES=	textproc
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

textproc/ruby-sanitize/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2023/02/04 13:33:10 taca Exp $
+$NetBSD: distinfo,v 1.2.4.1 2023/08/13 09:03:45 bsiegert Exp $
 
-BLAKE2s (sanitize-6.0.1.gem) = 7cd8b6d8845065bf5c90b60e2aec935376b87115c0849294692c34cb960a13eb
-SHA512 (sanitize-6.0.1.gem) = 361141150022788dbb804230621f4003d50d82ce6c8767581a3ec74d61388088546f3105a60b440bedb602de1b06d3a3625218f9e0a23c19409fad3385151267
-Size (sanitize-6.0.1.gem) = 47616 bytes
+BLAKE2s (sanitize-6.0.2.gem) = f44068d396c47968a2f858703761cca30e6f23414f4cebf8178d3012a96cb1e4
+SHA512 (sanitize-6.0.2.gem) = 2e83ecf0bcecaec56eaae2935d3f967d983d0dcdce76d358291a3dec1411c5e5e85b80ec3ab6d2d2718211eae6542796744278e9f9a4236157809027403295e1
+Size (sanitize-6.0.2.gem) = 47616 bytes

www/arcticfox/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2023/05/29 10:28:37 abs Exp $
+# $NetBSD: Makefile,v 1.28.2.1 2023/07/11 16:01:15 bsiegert Exp $
 
 DISTNAME=	arcticfox-41.0
 PKGREVISION=	1
@@ -59,13 +59,13 @@ CONFIGURE_ARGS+=	--with-system-nss
 CONFIGURE_ARGS+=	--with-system-nspr
 CONFIGURE_ARGS+=	--with-system-zlib
 
-.include "../../mk/bsd.prefs.mk"
-
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
 # Without this NetBSD/sparc64 starts, but crashes on some sites
 SSP_SUPPORTED=no
 .endif
 
+.include "../../mk/bsd.prefs.mk"
+
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 TOOL_DEPENDS+=		yasm>=1.1:../../devel/yasm
 .endif