doc: Pullup ticket #6552

www/firefox91: security fix

Revisions pulled up:
- www/firefox91-l10n/Makefile                                   1.5
- www/firefox91-l10n/distinfo                                   1.7
- www/firefox91/Makefile                                        1.10
- www/firefox91/distinfo                                        1.7

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Fri Dec 10 14:32:07 UTC 2021

   Modified Files:
   	pkgsrc/www/firefox91: Makefile distinfo
   	pkgsrc/www/firefox91-l10n: Makefile distinfo

   Log Message:
   firefox91: Update to 91.4.0

   Security Vulnerabilities fixed in Firefox ESR 91.4.0

       #CVE-2021-43536: URL leakage when navigating while executing asynchronous
       function

       #CVE-2021-43537: Heap buffer overflow when using structured clone

       #CVE-2021-43538: Missing fullscreen and pointer lock notification when
       requesting both

       #CVE-2021-43539: GC rooting failure when calling wasm instance methods

       #CVE-2021-43541: External protocol handler parameters were unescaped

       #CVE-2021-43542: XMLHttpRequest error codes could have leaked the existence
       of an external protocol handler

       #CVE-2021-43543: Bypass of CSP sandbox directive when embedding

       #CVE-2021-43545: Denial of Service when using the Location API in a loop

       #CVE-2021-43546: Cursor spoofing could overlay user interface when native
       cursor is zoomed

       #MOZ-2021-0009: Memory safety bugs fixed in Firefox 95 and Firefox ESR 91.4

chat/matrix-synapse/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2021/08/31 19:57:59 js Exp $
+# $NetBSD: Makefile,v 1.33.2.1 2021/11/24 19:52:42 spz Exp $
 
-DISTNAME=	matrix-synapse-1.41.1
+DISTNAME=	matrix-synapse-1.47.1
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
 EGG_NAME=	matrix_synapse-${PKGVERSION_NOREV}
@@ -13,7 +13,7 @@ COMMENT=	Reference homeserver for the Matrix decentralised comms protocol
 LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
-DEPENDS+=	${PYPKGPREFIX}-jsonschema>=2.5.1:../../textproc/py-jsonschema
+DEPENDS+=	${PYPKGPREFIX}-jsonschema>=3.0.0:../../textproc/py-jsonschema
 DEPENDS+=	${PYPKGPREFIX}-frozendict>=1:../../devel/py-frozendict
 DEPENDS+=	${PYPKGPREFIX}-unpaddedbase64>=1.1.0:../../devel/py-unpaddedbase64
 DEPENDS+=	${PYPKGPREFIX}-canonicaljson>=1.4.0:../../devel/py-canonicaljson
@@ -27,14 +27,12 @@ DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=16.0.0:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
 DEPENDS+=	${PYPKGPREFIX}-asn1>=0.1.9:../../security/py-asn1
 DEPENDS+=	${PYPKGPREFIX}-asn1-modules>=0.0.7:../../security/py-asn1-modules
-DEPENDS+=	${PYPKGPREFIX}-daemonize>=2.3.1:../../devel/py-daemonize
 DEPENDS+=	${PYPKGPREFIX}-bcrypt>=3.1.0:../../security/py-bcrypt
 DEPENDS+=	${PYPKGPREFIX}-sortedcontainers>=1.4.4:../../devel/py-sortedcontainers
 DEPENDS+=	${PYPKGPREFIX}-macaroons>=0.13.0:../../devel/py-macaroons
 DEPENDS+=	${PYPKGPREFIX}-msgpack>=0.5.2:../../devel/py-msgpack
 DEPENDS+=	${PYPKGPREFIX}-phonenumbers>=8.2.0:../../textproc/py-phonenumbers
-DEPENDS+=	${PYPKGPREFIX}-six>=1.10:../../lang/py-six
-DEPENDS+=	${PYPKGPREFIX}-prometheus_client>=0.8.0:../../net/py-prometheus_client
+DEPENDS+=	${PYPKGPREFIX}-prometheus_client>=0.4.0:../../net/py-prometheus_client
 DEPENDS+=	${PYPKGPREFIX}-attrs>=19.2.0:../../devel/py-attrs
 DEPENDS+=	${PYPKGPREFIX}-netaddr>=0.7.18:../../net/py-netaddr
 DEPENDS+=	${PYPKGPREFIX}-jinja2>=2.9:../../textproc/py-jinja2

chat/matrix-synapse/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2021/08/31 19:57:59 js Exp $
+@comment $NetBSD: PLIST,v 1.17.2.1 2021/11/24 19:52:42 spz Exp $
 bin/export_signing_key
 bin/generate_config
 bin/generate_log_config
@@ -10,6 +10,7 @@ bin/synapse_port_db
 bin/synapse_review_recent_signups
 bin/sync_room_to_group.pl
 bin/synctl
+bin/update_synapse_database
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -185,6 +186,9 @@ ${PYSITELIB}/synapse/config/metrics.pyo
 ${PYSITELIB}/synapse/config/modules.py
 ${PYSITELIB}/synapse/config/modules.pyc
 ${PYSITELIB}/synapse/config/modules.pyo
+${PYSITELIB}/synapse/config/oembed.py
+${PYSITELIB}/synapse/config/oembed.pyc
+${PYSITELIB}/synapse/config/oembed.pyo
 ${PYSITELIB}/synapse/config/oidc.py
 ${PYSITELIB}/synapse/config/oidc.pyc
 ${PYSITELIB}/synapse/config/oidc.pyo
@@ -206,6 +210,9 @@ ${PYSITELIB}/synapse/config/registration.pyo
 ${PYSITELIB}/synapse/config/repository.py
 ${PYSITELIB}/synapse/config/repository.pyc
 ${PYSITELIB}/synapse/config/repository.pyo
+${PYSITELIB}/synapse/config/retention.py
+${PYSITELIB}/synapse/config/retention.pyc
+${PYSITELIB}/synapse/config/retention.pyo
 ${PYSITELIB}/synapse/config/room.py
 ${PYSITELIB}/synapse/config/room.pyc
 ${PYSITELIB}/synapse/config/room.pyo
@@ -350,9 +357,6 @@ ${PYSITELIB}/synapse/groups/groups_server.pyo
 ${PYSITELIB}/synapse/handlers/__init__.py
 ${PYSITELIB}/synapse/handlers/__init__.pyc
 ${PYSITELIB}/synapse/handlers/__init__.pyo
-${PYSITELIB}/synapse/handlers/_base.py
-${PYSITELIB}/synapse/handlers/_base.pyc
-${PYSITELIB}/synapse/handlers/_base.pyo
 ${PYSITELIB}/synapse/handlers/account_data.py
 ${PYSITELIB}/synapse/handlers/account_data.pyc
 ${PYSITELIB}/synapse/handlers/account_data.pyo
@@ -398,6 +402,9 @@ ${PYSITELIB}/synapse/handlers/events.pyo
 ${PYSITELIB}/synapse/handlers/federation.py
 ${PYSITELIB}/synapse/handlers/federation.pyc
 ${PYSITELIB}/synapse/handlers/federation.pyo
+${PYSITELIB}/synapse/handlers/federation_event.py
+${PYSITELIB}/synapse/handlers/federation_event.pyc
+${PYSITELIB}/synapse/handlers/federation_event.pyo
 ${PYSITELIB}/synapse/handlers/groups_local.py
 ${PYSITELIB}/synapse/handlers/groups_local.pyc
 ${PYSITELIB}/synapse/handlers/groups_local.pyo
@@ -437,6 +444,9 @@ ${PYSITELIB}/synapse/handlers/register.pyo
 ${PYSITELIB}/synapse/handlers/room.py
 ${PYSITELIB}/synapse/handlers/room.pyc
 ${PYSITELIB}/synapse/handlers/room.pyo
+${PYSITELIB}/synapse/handlers/room_batch.py
+${PYSITELIB}/synapse/handlers/room_batch.pyc
+${PYSITELIB}/synapse/handlers/room_batch.pyo
 ${PYSITELIB}/synapse/handlers/room_list.py
 ${PYSITELIB}/synapse/handlers/room_list.pyc
 ${PYSITELIB}/synapse/handlers/room_list.pyo
@@ -623,6 +633,7 @@ ${PYSITELIB}/synapse/push/pusherpool.pyo
 ${PYSITELIB}/synapse/push/rulekinds.py
 ${PYSITELIB}/synapse/push/rulekinds.pyc
 ${PYSITELIB}/synapse/push/rulekinds.pyo
+${PYSITELIB}/synapse/py.typed
 ${PYSITELIB}/synapse/python_dependencies.py
 ${PYSITELIB}/synapse/python_dependencies.pyc
 ${PYSITELIB}/synapse/python_dependencies.pyo
@@ -758,6 +769,7 @@ ${PYSITELIB}/synapse/replication/tcp/streams/events.pyo
 ${PYSITELIB}/synapse/replication/tcp/streams/federation.py
 ${PYSITELIB}/synapse/replication/tcp/streams/federation.pyc
 ${PYSITELIB}/synapse/replication/tcp/streams/federation.pyo
+${PYSITELIB}/synapse/res/providers.json
 ${PYSITELIB}/synapse/res/templates/account_previously_renewed.html
 ${PYSITELIB}/synapse/res/templates/account_renewed.html
 ${PYSITELIB}/synapse/res/templates/add_threepid.html
@@ -786,6 +798,7 @@ ${PYSITELIB}/synapse/res/templates/registration.html
 ${PYSITELIB}/synapse/res/templates/registration.txt
 ${PYSITELIB}/synapse/res/templates/registration_failure.html
 ${PYSITELIB}/synapse/res/templates/registration_success.html
+${PYSITELIB}/synapse/res/templates/registration_token.html
 ${PYSITELIB}/synapse/res/templates/room.html
 ${PYSITELIB}/synapse/res/templates/room.txt
 ${PYSITELIB}/synapse/res/templates/sso.css
@@ -811,6 +824,9 @@ ${PYSITELIB}/synapse/rest/admin/__init__.pyo
 ${PYSITELIB}/synapse/rest/admin/_base.py
 ${PYSITELIB}/synapse/rest/admin/_base.pyc
 ${PYSITELIB}/synapse/rest/admin/_base.pyo
+${PYSITELIB}/synapse/rest/admin/background_updates.py
+${PYSITELIB}/synapse/rest/admin/background_updates.pyc
+${PYSITELIB}/synapse/rest/admin/background_updates.pyo
 ${PYSITELIB}/synapse/rest/admin/devices.py
 ${PYSITELIB}/synapse/rest/admin/devices.pyc
 ${PYSITELIB}/synapse/rest/admin/devices.pyo
@@ -823,9 +839,9 @@ ${PYSITELIB}/synapse/rest/admin/groups.pyo
 ${PYSITELIB}/synapse/rest/admin/media.py
 ${PYSITELIB}/synapse/rest/admin/media.pyc
 ${PYSITELIB}/synapse/rest/admin/media.pyo
-${PYSITELIB}/synapse/rest/admin/purge_room_servlet.py
-${PYSITELIB}/synapse/rest/admin/purge_room_servlet.pyc
-${PYSITELIB}/synapse/rest/admin/purge_room_servlet.pyo
+${PYSITELIB}/synapse/rest/admin/registration_tokens.py
+${PYSITELIB}/synapse/rest/admin/registration_tokens.pyc
+${PYSITELIB}/synapse/rest/admin/registration_tokens.pyo
 ${PYSITELIB}/synapse/rest/admin/rooms.py
 ${PYSITELIB}/synapse/rest/admin/rooms.pyc
 ${PYSITELIB}/synapse/rest/admin/rooms.pyo
@@ -1015,6 +1031,9 @@ ${PYSITELIB}/synapse/rest/media/v1/media_repository.pyo
 ${PYSITELIB}/synapse/rest/media/v1/media_storage.py
 ${PYSITELIB}/synapse/rest/media/v1/media_storage.pyc
 ${PYSITELIB}/synapse/rest/media/v1/media_storage.pyo
+${PYSITELIB}/synapse/rest/media/v1/oembed.py
+${PYSITELIB}/synapse/rest/media/v1/oembed.pyc
+${PYSITELIB}/synapse/rest/media/v1/oembed.pyo
 ${PYSITELIB}/synapse/rest/media/v1/preview_url_resource.py
 ${PYSITELIB}/synapse/rest/media/v1/preview_url_resource.pyc
 ${PYSITELIB}/synapse/rest/media/v1/preview_url_resource.pyo
@@ -1233,12 +1252,18 @@ ${PYSITELIB}/synapse/storage/databases/main/relations.pyo
 ${PYSITELIB}/synapse/storage/databases/main/room.py
 ${PYSITELIB}/synapse/storage/databases/main/room.pyc
 ${PYSITELIB}/synapse/storage/databases/main/room.pyo
+${PYSITELIB}/synapse/storage/databases/main/room_batch.py
+${PYSITELIB}/synapse/storage/databases/main/room_batch.pyc
+${PYSITELIB}/synapse/storage/databases/main/room_batch.pyo
 ${PYSITELIB}/synapse/storage/databases/main/roommember.py
 ${PYSITELIB}/synapse/storage/databases/main/roommember.pyc
 ${PYSITELIB}/synapse/storage/databases/main/roommember.pyo
 ${PYSITELIB}/synapse/storage/databases/main/search.py
 ${PYSITELIB}/synapse/storage/databases/main/search.pyc
 ${PYSITELIB}/synapse/storage/databases/main/search.pyo
+${PYSITELIB}/synapse/storage/databases/main/session.py
+${PYSITELIB}/synapse/storage/databases/main/session.pyc
+${PYSITELIB}/synapse/storage/databases/main/session.pyo
 ${PYSITELIB}/synapse/storage/databases/main/signatures.py
 ${PYSITELIB}/synapse/storage/databases/main/signatures.pyc
 ${PYSITELIB}/synapse/storage/databases/main/signatures.pyo
@@ -1618,6 +1643,18 @@ ${PYSITELIB}/synapse/storage/schema/main/delta/61/03recreate_min_depth.py
 ${PYSITELIB}/synapse/storage/schema/main/delta/61/03recreate_min_depth.pyc
 ${PYSITELIB}/synapse/storage/schema/main/delta/61/03recreate_min_depth.pyo
 ${PYSITELIB}/synapse/storage/schema/main/delta/62/01insertion_event_extremities.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/63/01create_registration_tokens.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/63/02delete_unlinked_email_pushers.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/63/02populate-rooms-creator.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/63/03session_store.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/63/04add_presence_stream_not_offline_index.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/64/01msc2716_chunk_to_batch_rename.sql.postgres
+${PYSITELIB}/synapse/storage/schema/main/delta/64/01msc2716_chunk_to_batch_rename.sql.sqlite
+${PYSITELIB}/synapse/storage/schema/main/delta/65/01msc2716_insertion_event_edges.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/65/02_thread_relations.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/65/03remove_hidden_devices_from_device_inbox.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/65/04_local_group_updates.sql
+${PYSITELIB}/synapse/storage/schema/main/delta/65/06remove_deleted_devices_from_device_inbox.sql
 ${PYSITELIB}/synapse/storage/schema/main/full_schemas/16/application_services.sql
 ${PYSITELIB}/synapse/storage/schema/main/full_schemas/16/event_edges.sql
 ${PYSITELIB}/synapse/storage/schema/main/full_schemas/16/event_signatures.sql
@@ -1729,6 +1766,9 @@ ${PYSITELIB}/synapse/util/file_consumer.pyo
 ${PYSITELIB}/synapse/util/frozenutils.py
 ${PYSITELIB}/synapse/util/frozenutils.pyc
 ${PYSITELIB}/synapse/util/frozenutils.pyo
+${PYSITELIB}/synapse/util/gai_resolver.py
+${PYSITELIB}/synapse/util/gai_resolver.pyc
+${PYSITELIB}/synapse/util/gai_resolver.pyo
 ${PYSITELIB}/synapse/util/hash.py
 ${PYSITELIB}/synapse/util/hash.pyc
 ${PYSITELIB}/synapse/util/hash.pyo

chat/matrix-synapse/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2021/08/31 19:57:59 js Exp $
+$NetBSD: distinfo,v 1.23.2.1 2021/11/24 19:52:42 spz Exp $
 
-SHA1 (matrix-synapse-1.41.1.tar.gz) = f9a2387a209824077cb45f3fe14775bb3d356be5
-RMD160 (matrix-synapse-1.41.1.tar.gz) = f2392d2fc7a84c4524edc74a3aee268e974dc291
-SHA512 (matrix-synapse-1.41.1.tar.gz) = 04af3261433874141372ddb91150f4e801770c73d42305c94db13a0e420ee7c483b50c4b7c4aca59ec98762b65823d2cdabb75409eb66b2ced47a5c316206767
-Size (matrix-synapse-1.41.1.tar.gz) = 7436053 bytes
+SHA1 (matrix-synapse-1.47.1.tar.gz) = 7d683830d7cae54228345361ee4009ef03c3f1fb
+RMD160 (matrix-synapse-1.47.1.tar.gz) = 568f0fd723c6a45d0ba6cdb5a84670ce6c4e1a19
+SHA512 (matrix-synapse-1.47.1.tar.gz) = 29ebfcf43e7766a638cd26e17430772625651cd8d28c8637ae5d2550207a0131f7eeab0cbe2d8e9e4914ffa13cbafe830ef0e80b22a356ac5abe6a88733ad97c
+Size (matrix-synapse-1.47.1.tar.gz) = 7566339 bytes
 SHA1 (patch-synapse_handlers_room.py) = f9a62add7171898ec0ea76360f0a4c9969609537
 SHA1 (patch-synapse_python_dependencies.py) = 914ae3a34a9367b2d479d393ddc7a07cbff65b36

databases/hiredis/Makefile

@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2021/06/23 19:35:44 adam Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2021/10/11 18:40:50 bsiegert Exp $
 
-DISTNAME=	hiredis-1.0.0
+DISTNAME=	hiredis-1.0.2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GITHUB:=redis/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	wiedi@frubar.net
-HOMEPAGE=	https://github.com/redis/hiredis/
+HOMEPAGE=	https://github.com/redis/hiredis
 COMMENT=	Minimalistic C client library for the Redis database
 LICENSE=	modified-bsd
 

databases/hiredis/distinfo

@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.10 2021/06/23 19:35:44 adam Exp $
+$NetBSD: distinfo,v 1.10.2.1 2021/10/11 18:40:50 bsiegert Exp $
 
-SHA1 (hiredis-1.0.0.tar.gz) = 26242153e8ce5bfd0f953b3c036f0c63e8c939fe
-RMD160 (hiredis-1.0.0.tar.gz) = 397b66137f7211936e6044b40cda26d9526b1564
-SHA512 (hiredis-1.0.0.tar.gz) = eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69
-Size (hiredis-1.0.0.tar.gz) = 97507 bytes
+RMD160 (hiredis-1.0.2.tar.gz) = a3924f0d60525d9c2d52b56c74733a5532b6b2c8
+SHA512 (hiredis-1.0.2.tar.gz) = 86497a1c21869bbe535378885eee6dbd594ef96325966511a3513f81e501af0f5ac7fed864f3230372f3ac7a23c05bad477fa5aa90b9747c9fb1408028174f9b
+Size (hiredis-1.0.2.tar.gz) = 98139 bytes
 SHA1 (patch-Makefile) = 2071de674bd5322365702986421accbfd1aadbcc

databases/ldb/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2021/06/22 09:36:41 nia Exp $
+# $NetBSD: Makefile,v 1.23.4.1 2021/11/23 23:02:20 tm Exp $
 
 # Before updating, make sure net/samba4 supports the newer version.
-DISTNAME=	ldb-2.2.1
+DISTNAME=	ldb-2.2.3
 CATEGORIES=	databases
 MASTER_SITES=	https://www.samba.org/ftp/ldb/
 

databases/ldb/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2021/06/22 09:36:41 nia Exp $
+$NetBSD: distinfo,v 1.14.4.1 2021/11/23 23:02:20 tm Exp $
 
-SHA1 (ldb-2.2.1.tar.gz) = c334d5a398b7a61c003d3cefbdb5736c49f0013c
-RMD160 (ldb-2.2.1.tar.gz) = 0949458a58ca2c9905574a8f9626501d37e13c2f
-SHA512 (ldb-2.2.1.tar.gz) = a2b1598869e3d9f17c5b82fc2b7289f1f08a7378a1d72609af5ed5cc91fb571ac67d3a8c22d64dad5dcc9fe32520baccd5cc37d5b4fc5f1b00a7064902296344
-Size (ldb-2.2.1.tar.gz) = 1676819 bytes
+SHA1 (ldb-2.2.3.tar.gz) = 8043c810fe79689b1e65824b88b6ba07ffff93bb
+RMD160 (ldb-2.2.3.tar.gz) = 7b28b4e80100afd79783ddab7ea04cd8b508150c
+SHA512 (ldb-2.2.3.tar.gz) = 0fdda9e033cbd04d6b50c76ecf044068353d2abf50c5c9d9c804b8b9e70f6d85bf925ac984a38c2b7a159a384bfc94e5232b05a32cdbc9299dc43930d1b6a985
+Size (ldb-2.2.3.tar.gz) = 1708827 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 813c639e404e3b301444decae318c702c87f0cc1
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2

databases/mariadb105-client/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2021/08/12 10:50:19 nia Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2021/12/14 08:07:21 tm 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,12 +1,11 @@
-# $NetBSD: Makefile.common,v 1.13 2021/09/01 06:21:46 nia Exp $
+# $NetBSD: Makefile.common,v 1.13.2.1 2021/12/14 08:07:21 tm Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
 
-DISTNAME=	mariadb-10.5.12
+DISTNAME=	mariadb-10.5.13
 CATEGORIES=	databases
-MASTER_SITES=	https://downloads.mariadb.org/f/${DISTNAME}/source/
-MASTER_SITES+=	https://archive.mariadb.org/${DISTNAME}/source/
+MASTER_SITES=	https://archive.mariadb.org/${DISTNAME}/source/
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://mariadb.org/
@@ -47,6 +46,8 @@ CMAKE_ARGS+=		-DINSTALL_LIBDIR="lib"
 CMAKE_ARGS+=		-DINSTALL_MANDIR="${PKGMANDIR}"
 CMAKE_ARGS+=		-DINSTALL_MYSQLSHAREDIR="share/mysql"
 CMAKE_ARGS+=		-DINSTALL_MYSQLTESTDIR=""
+CMAKE_ARGS+=		-DINSTALL_PAMDIR="lib/security"
+CMAKE_ARGS+=		-DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam"
 CMAKE_ARGS+=		-DINSTALL_PLUGINDIR="lib/mysql/plugin"
 CMAKE_ARGS+=		-DINSTALL_SBINDIR="sbin"
 CMAKE_ARGS+=		-DINSTALL_SCRIPTDIR="bin"

databases/mariadb105-client/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/08/12 10:50:19 nia Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2021/12/14 08:07:21 tm Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -179,6 +179,7 @@ include/mysql/server/private/my_default.h
 include/mysql/server/private/my_handler_errors.h
 include/mysql/server/private/my_libwrap.h
 include/mysql/server/private/my_md5.h
+include/mysql/server/private/my_minidump.h
 include/mysql/server/private/my_nosys.h
 include/mysql/server/private/my_rdtsc.h
 include/mysql/server/private/my_rnd.h

databases/mariadb105-client/distinfo

@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.7 2021/08/12 10:50:19 nia Exp $
+$NetBSD: distinfo,v 1.7.2.1 2021/12/14 08:07:21 tm Exp $
 
-SHA1 (mariadb-10.5.12.tar.gz) = 0e2ca328fdd2821c7a4400f7759cd6882a2c5840
-RMD160 (mariadb-10.5.12.tar.gz) = cfac6715b84ce1ed8e073fefad90c47875a0346b
-SHA512 (mariadb-10.5.12.tar.gz) = c732c2033304f273900b3dcf21936e28aebb147316fcabc7efdc43b75bc47c198daacfaaae082b997d4e695139d2aeaa2619bd29935f1b6f0aa25b9b9cde9ae5
-Size (mariadb-10.5.12.tar.gz) = 101914615 bytes
+SHA1 (mariadb-10.5.13.tar.gz) = a57d4ff38ab914878e56fc3f07d97d6c7bc73613
+RMD160 (mariadb-10.5.13.tar.gz) = 0ebadce633eee2c0c4eb8c430c5287045185d0ca
+SHA512 (mariadb-10.5.13.tar.gz) = 5d5ac04a3c8099a982cacb98dd4c162966fc7957e11c28e8b5645e49ffcf0513b9c8956f43d215c37e5eaa34aa8db6c71cfe993c89d62cab123021ee83169e7f
+Size (mariadb-10.5.13.tar.gz) = 102047279 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 893f329ed03e01144df166debb4d902ad0304811
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66
-SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = 00cfaf5826cc97084bc77033985e6686e1ce1628
 SHA1 (patch-plugin_auth__socket_auth__socket.c) = 850e94faff382a7e962f6d4d6ff960ddddc624c4
-SHA1 (patch-scripts_CMakeLists.txt) = bc55b8de1eb44e5516eed9ce4b5b1d0cc1a8f0af
+SHA1 (patch-scripts_CMakeLists.txt) = 54591a4d255a8133e06ab5d52bad262acffcddda
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
 SHA1 (patch-sql_mysqld.cc) = 19d325124cde1b45376c9710cdd104dc460f4bea
 SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3

databases/mariadb105-client/patches/patch-plugin_auth__pam_CMakeLists.txt

@@ -1,15 +0,0 @@
-$NetBSD: patch-plugin_auth__pam_CMakeLists.txt,v 1.1 2021/05/23 15:32:47 nia Exp $
-
-Check for pam_ext.h (not available on NetBSD).
-
---- plugin/auth_pam/CMakeLists.txt.orig	2021-02-18 23:22:29.000000000 +0000
-+++ plugin/auth_pam/CMakeLists.txt
-@@ -43,7 +43,7 @@ IF(HAVE_PAM_APPL_H)
-                      WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)"
-                    COMPONENT Server)
-   ENDIF()
--  IF(TARGET auth_pam OR TARGET auth_pam_v1)
-+  IF(HAVE_PAM_EXT_H AND (TARGET auth_pam OR TARGET auth_pam_v1))
-     ADD_SUBDIRECTORY(testing)
-     ADD_LIBRARY(pam_user_map MODULE mapper/pam_user_map.c)
-     TARGET_LINK_LIBRARIES(pam_user_map pam)

databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt

@@ -1,8 +1,8 @@
-$NetBSD: patch-scripts_CMakeLists.txt,v 1.2 2021/08/12 10:50:20 nia Exp $
+$NetBSD: patch-scripts_CMakeLists.txt,v 1.2.2.1 2021/12/14 08:07:21 tm Exp $
 
 Allow building a server-only configuration.
 
---- scripts/CMakeLists.txt.orig	2021-08-03 08:29:08.000000000 +0000
+--- scripts/CMakeLists.txt.orig	2021-11-05 19:40:05.000000000 +0000
 +++ scripts/CMakeLists.txt
 @@ -208,7 +208,7 @@ SET(pkgdata_locations "$basedir/${INSTAL
  # install mysql_install_db.sh at this point since it needs
@@ -22,9 +22,9 @@ Allow building a server-only configuration.
  SET(mariadb-access_COMPONENT Client)
 +SET(mariadb-convert-table-format_COMPONENT Client)
  SET(mariadb-find-rows_COMPONENT Client)
- SET(mytop_COMPONENT Mytop)
+ SET(mytop_COMPONENT Client)
  
-@@ -314,21 +317,21 @@ ELSE()
+@@ -314,21 +317,24 @@ ELSE()
        mariadbd-safe
        mariadb-dumpslow
      )
@@ -38,13 +38,12 @@ Allow building a server-only configuration.
 +      mariadb-find-rows
 +      mysql_config
 +      mytop
-+      mariadb-hotcopy
-+    )
++      mariadb-hotcopy)
    ENDIF()
--  # Configure this one, for testing, but do not install it.
--  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in
--    ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
--  # On Unix, most of the files end up in the bin directory
+   # Configure this one, for testing, but do not install it.
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in
+     ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
+   # On Unix, most of the files end up in the bin directory
    SET(BIN_SCRIPTS
 -    msql2mysql
 -    mariadb-setpermission

databases/mariadb105-server/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2021/08/12 10:51:31 nia Exp $
+# $NetBSD: Makefile,v 1.15.2.1 2021/12/14 08:07:21 tm Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	MariaDB 10.5, a free MySQL compatible database (server)
 
 CONFLICTS=	mysql-server-[0-9]*

databases/mariadb105-server/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2021/08/08 21:22:12 nia Exp $
+@comment $NetBSD: PLIST,v 1.7.2.2 2021/12/14 09:17:37 tm Exp $
 bin/aria_chk
 bin/aria_dump_log
 bin/aria_ftdump
@@ -342,6 +342,7 @@ lib/mysql/plugin/test_versioning.so
 lib/mysql/plugin/type_mysql_json.so
 lib/mysql/plugin/type_test.so
 lib/mysql/plugin/wsrep_info.so
+${PLIST.auth_pam}lib/security/pam_user_map.so
 sbin/mariadbd
 sbin/mysqld
 share/doc/mysql/COPYING
@@ -350,6 +351,7 @@ share/doc/mysql/INSTALL-BINARY
 share/doc/mysql/README-wsrep
 share/doc/mysql/README.md
 share/doc/mysql/THIRDPARTY
+${PLIST.auth_pam}share/examples/mariadb_auth_pam/user_map.conf
 share/mysql/charsets/Index.xml
 share/mysql/charsets/README
 share/mysql/charsets/armscii8.xml

databases/mariadb106-client/Makefile.common

@@ -1,12 +1,11 @@
-# $NetBSD: Makefile.common,v 1.5 2021/09/01 06:21:46 nia Exp $
+# $NetBSD: Makefile.common,v 1.5.2.1 2021/12/14 08:59:18 tm Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
 
-DISTNAME=	mariadb-10.6.4
+DISTNAME=	mariadb-10.6.5
 CATEGORIES=	databases
-MASTER_SITES=	https://downloads.mariadb.org/f/${DISTNAME}/source/
-MASTER_SITES+=	https://archive.mariadb.org/${DISTNAME}/source/
+MASTER_SITES=	https://archive.mariadb.org/${DISTNAME}/source/
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://mariadb.org/
@@ -47,6 +46,8 @@ CMAKE_ARGS+=		-DINSTALL_LIBDIR="lib"
 CMAKE_ARGS+=		-DINSTALL_MANDIR="${PKGMANDIR}"
 CMAKE_ARGS+=		-DINSTALL_MYSQLSHAREDIR="share/mysql"
 CMAKE_ARGS+=		-DINSTALL_MYSQLTESTDIR=""
+CMAKE_ARGS+=		-DINSTALL_PAMDIR="lib/security"
+CMAKE_ARGS+=		-DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam"
 CMAKE_ARGS+=		-DINSTALL_PLUGINDIR="lib/mysql/plugin"
 CMAKE_ARGS+=		-DINSTALL_SBINDIR="sbin"
 CMAKE_ARGS+=		-DINSTALL_SCRIPTDIR="bin"

databases/mariadb106-client/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/08/04 15:47:24 nia Exp $
+@comment $NetBSD: PLIST,v 1.1.2.1 2021/12/14 08:59:18 tm Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -181,6 +181,7 @@ include/mysql/server/private/my_default.h
 include/mysql/server/private/my_handler_errors.h
 include/mysql/server/private/my_libwrap.h
 include/mysql/server/private/my_md5.h
+include/mysql/server/private/my_minidump.h
 include/mysql/server/private/my_nosys.h
 include/mysql/server/private/my_rdtsc.h
 include/mysql/server/private/my_rnd.h

databases/mariadb106-client/distinfo

@@ -1,22 +1,21 @@
-$NetBSD: distinfo,v 1.2 2021/08/07 08:55:50 nia Exp $
+$NetBSD: distinfo,v 1.2.2.1 2021/12/14 08:59:18 tm Exp $
 
-SHA1 (mariadb-10.6.4.tar.gz) = d955487a1bfd5e1478e607d6077130d50ca817d0
-RMD160 (mariadb-10.6.4.tar.gz) = 11277c51648b2a85e6c8433b5aaa3b05e3f3efa5
-SHA512 (mariadb-10.6.4.tar.gz) = c216244ce126e6f8954303a76078dc12146e8ea941041edd215dc05201adda1d5158cd7f1c9831328f783aba4f884965ae288f33bbc43229bc6224a4f1079071
-Size (mariadb-10.6.4.tar.gz) = 84947143 bytes
+SHA1 (mariadb-10.6.5.tar.gz) = 7f385c8ee242f0b164db3dd72d39b26fac141c40
+RMD160 (mariadb-10.6.5.tar.gz) = 5bff753eb0239c3c9039fe3bab0a7b8fa70c52f6
+SHA512 (mariadb-10.6.5.tar.gz) = 5aafe0a8d5ae54a6f798a6fd0cf922521f5b8e54ef5fb5c7db1cf798a7755f5910bb0b8a6c371cb8253dfb48f4ebca0becd6eb543b68473d564d2092df3185a1
+Size (mariadb-10.6.5.tar.gz) = 85061860 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
-SHA1 (patch-CMakeLists.txt) = 893f329ed03e01144df166debb4d902ad0304811
+SHA1 (patch-CMakeLists.txt) = ea2f334ff1743e1676fe73e9946d0759c68e1d31
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
-SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51
-SHA1 (patch-plugin_auth__socket_auth__socket.c) = 094d49d8302be8e7111b6eddd3b6462a553cc22a
-SHA1 (patch-scripts_CMakeLists.txt) = e58c21db8fe03f85c496bbdc04c8e30f4a7a7f24
+SHA1 (patch-scripts_CMakeLists.txt) = b8a13304e314162ab0a1fc06c5620d6b757975f5
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
 SHA1 (patch-sql_mysqld.cc) = 19d325124cde1b45376c9710cdd104dc460f4bea
 SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3
 SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836
+SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = 1db38a9c1ec3ce7274dc08cb9c5b42d474b431aa
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301
 SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = 67ea4d154f4f623fdca739f50b236c973e118a12

databases/mariadb106-client/patches/patch-CMakeLists.txt

@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2021/08/04 15:47:24 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.1.2.1 2021/12/14 08:59:19 tm Exp $
 
 Allow building a server-only configuration.
 
---- CMakeLists.txt.orig	2021-05-05 21:00:18.000000000 +0000
+--- CMakeLists.txt.orig	2021-11-05 20:03:29.000000000 +0000
 +++ CMakeLists.txt
-@@ -421,8 +421,6 @@ ENDIF()
+@@ -418,8 +418,6 @@ ENDIF()
  
  UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE)
  
@@ -13,7 +13,7 @@ Allow building a server-only configuration.
  INCLUDE(cpack_rpm)
  INCLUDE(cpack_deb)
  
-@@ -432,13 +430,11 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
+@@ -429,19 +427,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
  # Add storage engines and plugins.
  CONFIGURE_PLUGINS()
  
@@ -27,7 +27,13 @@ Allow building a server-only configuration.
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(libservices)
  ADD_SUBDIRECTORY(sql/share)
-@@ -461,23 +457,26 @@ IF(NOT WITHOUT_SERVER)
+ 
+ IF(NOT WITHOUT_SERVER)
+-  ADD_SUBDIRECTORY(tests)
+   ADD_SUBDIRECTORY(sql)
+   OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF)
+   IF(WITH_EMBEDDED_SERVER)
+@@ -460,23 +455,26 @@ IF(NOT WITHOUT_SERVER)
      ADD_SUBDIRECTORY(win/upgrade_wizard)
      ADD_SUBDIRECTORY(win/packaging)
    ENDIF()
@@ -59,3 +65,45 @@ Allow building a server-only configuration.
    ENDIF()
    # minimal target to build only binaries for export
    ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
+@@ -557,41 +555,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
+   MESSAGE(WARNING "
+ You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries!  You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software Foundation.")
+ ENDIF()
+-
+-IF(NOT WITHOUT_SERVER)
+-  # Define target for minimal mtr-testable build
+-  ADD_CUSTOM_TARGET(minbuild)
+-  ADD_DEPENDENCIES(minbuild
+-   aria_chk
+-   aria_pack
+-   mariadb
+-   mariadb-admin
+-   mariadb-binlog
+-   mariadb-check
+-   mariadb-client-test
+-   mariadb-conv
+-   mariadb-dump
+-   mariadb-import
+-   mariadb-plugin
+-   mariadb-show
+-   mariadb-slap
+-   mariadb-test
+-   mariadb-tzinfo-to-sql
+-   mariadb-upgrade
+-   mariadbd
+-   my_print_defaults
+-   my_safe_process
+-   myisam_ftdump
+-   myisamchk
+-   myisamlog
+-   myisampack
+-   perror
+-   replace)
+-  IF(WIN32)
+-    ADD_DEPENDENCIES(minbuild echo mariadb-install-db my_safe_kill)
+-  ENDIF()
+-  ADD_CUSTOM_TARGET(smoketest
+-    COMMAND perl ./mysql-test-run.pl main.1st
+-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/mysql-test)
+-  ADD_DEPENDENCIES(smoketest minbuild)
+-ENDIF()

databases/mariadb106-client/patches/patch-plugin_auth__pam_CMakeLists.txt

@@ -1,15 +0,0 @@
-$NetBSD: patch-plugin_auth__pam_CMakeLists.txt,v 1.1 2021/08/04 15:47:24 nia Exp $
-
-Check for pam_ext.h (not available on NetBSD).
-
---- plugin/auth_pam/CMakeLists.txt.orig	2021-02-18 23:22:29.000000000 +0000
-+++ plugin/auth_pam/CMakeLists.txt
-@@ -43,7 +43,7 @@ IF(HAVE_PAM_APPL_H)
-                      WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)"
-                    COMPONENT Server)
-   ENDIF()
--  IF(TARGET auth_pam OR TARGET auth_pam_v1)
-+  IF(HAVE_PAM_EXT_H AND (TARGET auth_pam OR TARGET auth_pam_v1))
-     ADD_SUBDIRECTORY(testing)
-     ADD_LIBRARY(pam_user_map MODULE mapper/pam_user_map.c)
-     TARGET_LINK_LIBRARIES(pam_user_map pam)

databases/mariadb106-client/patches/patch-plugin_auth__socket_auth__socket.c

@@ -1,21 +0,0 @@
-$NetBSD: patch-plugin_auth__socket_auth__socket.c,v 1.1 2021/08/04 15:47:24 nia Exp $
-
-Add SO_PEERCRED definitions for NetBSD.
-https://github.com/MariaDB/server/pull/1884
-
---- plugin/auth_socket/auth_socket.c.orig	2021-07-05 10:15:49.000000000 +0000
-+++ plugin/auth_socket/auth_socket.c
-@@ -47,6 +47,13 @@
- #define uid cr_uid
- #define ucred xucred
- 
-+#elif defined HAVE_UNPCBID
-+#include <sys/un.h>
-+#define level 0
-+#define SO_PEERCRED LOCAL_PEEREID
-+#define uid unp_euid
-+#define ucred unpcbid
-+
- #elif defined HAVE_GETPEERUCRED
- #include <ucred.h>
- 

databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt

@@ -1,8 +1,8 @@
-$NetBSD: patch-scripts_CMakeLists.txt,v 1.1 2021/08/04 15:47:24 nia Exp $
+$NetBSD: patch-scripts_CMakeLists.txt,v 1.1.2.1 2021/12/14 08:59:19 tm Exp $
 
 Allow building a server-only configuration.
 
---- scripts/CMakeLists.txt.orig	2021-07-05 10:15:49.000000000 +0000
+--- scripts/CMakeLists.txt.orig	2021-11-05 20:03:30.000000000 +0000
 +++ scripts/CMakeLists.txt
 @@ -324,22 +324,26 @@ ELSE()
        mariadbd-safe

databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h

@@ -0,0 +1,20 @@
+$NetBSD: patch-storage_innobase_include_transactional__lock__guard.h,v 1.1.2.2 2021/12/14 08:59:19 tm Exp $
+
+Strange build failures on NetBSD:
+error: 'rw_lock' is not an accessible base of 'page_hash_latch'
+
+--- storage/innobase/include/transactional_lock_guard.h.orig	2021-11-05 20:03:31.000000000 +0000
++++ storage/innobase/include/transactional_lock_guard.h
+@@ -21,12 +21,6 @@ this program; if not, write to the Free 
+ #if defined __powerpc64__ && defined __clang__ && defined __linux__
+ #elif defined __powerpc64__&&defined __GNUC__&&defined __linux__&&__GNUC__ > 4
+ #elif defined _MSC_VER && (defined _M_IX86 || defined _M_X64)
+-#elif defined __GNUC__ && (defined __i386__ || defined __x86_64__)
+-# if __GNUC__ >= 8
+-# elif defined __clang_major__ && __clang_major__ > 6
+-# else
+-#  define NO_ELISION
+-# endif
+ #else /* Transactional memory has not been implemented for this ISA */
+ # define NO_ELISION
+ #endif

databases/mariadb106-server/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2021/08/12 10:51:31 nia Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2021/12/14 08:59:19 tm Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	MariaDB 10.6, a free MySQL compatible database (server)
 
 CONFLICTS=	mysql-server-[0-9]*

databases/mariadb106-server/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2021/08/08 21:22:12 nia Exp $
+@comment $NetBSD: PLIST,v 1.4.2.2 2021/12/14 09:17:37 tm Exp $
 bin/aria_chk
 bin/aria_dump_log
 bin/aria_ftdump
@@ -8,7 +8,6 @@ bin/aria_s3_copy
 bin/innochecksum
 ${PLIST.mariabackup}bin/mariabackup
 ${PLIST.mariabackup}bin/mariadb-backup
-bin/mariadb-client-test
 ${PLIST.embedded}bin/mariadb-client-test-embedded
 ${PLIST.embedded}bin/mariadb-embedded
 bin/mariadb-fix-extensions
@@ -27,7 +26,6 @@ bin/myisamchk
 bin/myisamlog
 bin/myisampack
 ${PLIST.rocksdb}bin/myrocks_hotbackup
-bin/mysql_client_test
 ${PLIST.embedded}bin/mysql_client_test_embedded
 ${PLIST.embedded}bin/mysql_embedded
 bin/mysql_fix_extensions
@@ -344,6 +342,7 @@ lib/mysql/plugin/test_versioning.so
 lib/mysql/plugin/type_mysql_json.so
 lib/mysql/plugin/type_test.so
 lib/mysql/plugin/wsrep_info.so
+${PLIST.auth_pam}lib/security/pam_user_map.so
 sbin/mariadbd
 sbin/mysqld
 share/doc/mysql/COPYING
@@ -352,6 +351,7 @@ share/doc/mysql/INSTALL-BINARY
 share/doc/mysql/README-wsrep
 share/doc/mysql/README.md
 share/doc/mysql/THIRDPARTY
+${PLIST.auth_pam}share/examples/mariadb_auth_pam/user_map.conf
 share/mysql/charsets/Index.xml
 share/mysql/charsets/README
 share/mysql/charsets/armscii8.xml

databases/p5-DBI/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2021/05/24 19:49:34 wiz Exp $
+# $NetBSD: Makefile,v 1.86.4.1 2021/10/16 17:51:39 tm Exp $
 
 DISTNAME=	DBI-1.643
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBI/}
 

databases/p5-DBI/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.52 2020/05/17 09:12:01 wen Exp $
+$NetBSD: distinfo,v 1.52.12.1 2021/10/16 17:51:39 tm Exp $
 
 SHA1 (DBI-1.643.tar.gz) = fdbe7a86873eed196be5f9753aabed5c1e22f2cb
 RMD160 (DBI-1.643.tar.gz) = c944a9568c4aa0c8f5e936bba47d9ee55d16b6cb
 SHA512 (DBI-1.643.tar.gz) = 03812f3eb1e43c8290dadb8cb14bbced9ec6e237228ea2a2ba91f22e52143906a91a7e82945dab30b1d1b9fc925073721111adafd9a09fac070808ab88f908b8
 Size (DBI-1.643.tar.gz) = 612372 bytes
+SHA1 (patch-lib_DBD_File.pm) = e268b5f59b4474b8c2f5d72891c31f5d0f53c0c0

databases/p5-DBI/patches/patch-lib_DBD_File.pm

@@ -0,0 +1,28 @@
+$NetBSD: patch-lib_DBD_File.pm,v 1.1.2.2 2021/10/16 17:51:39 tm Exp $
+
+Fix CVE-2014-10402
+https://github.com/perl5-dbi/dbi/pull/93/commits/19d0fb169eed475e1c053e99036b8668625cfa94
+
+--- lib/DBD/File.pm.orig	2016-11-09 10:11:37.000000000 +0000
++++ lib/DBD/File.pm
+@@ -109,7 +109,11 @@ sub connect
+     # We do not (yet) care about conflicting attributes here
+     # my $dbh = DBI->connect ("dbi:CSV:f_dir=test", undef, undef, { f_dir => "text" });
+     # will test here that both test and text should exist
+-    if (my $attr_hash = (DBI->parse_dsn ($dbname))[3]) {
++    #
++    # Parsing on our own similar to parse_dsn to find attributes in 'dbname' parameter.
++    if ($dbname) {
++	my @attrs = split /;/ => $dbname;
++	my $attr_hash = { map { split /\s*=>?\s*|\s*,\s*/, $_} @attrs };
+ 	if (defined $attr_hash->{f_dir} && ! -d $attr_hash->{f_dir}) {
+ 	    my $msg = "No such directory '$attr_hash->{f_dir}";
+ 	    $drh->set_err (2, $msg);
+@@ -120,7 +124,6 @@ sub connect
+     if ($attr and defined $attr->{f_dir} && ! -d $attr->{f_dir}) {
+ 	my $msg = "No such directory '$attr->{f_dir}";
+ 	$drh->set_err (2, $msg);
+-	$attr->{RaiseError} and croak $msg;
+ 	return;
+ 	}
+ 

databases/postgresql10-docs/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2021/08/13 11:54:44 adam Exp $
+@comment $NetBSD: PLIST,v 1.19.2.1 2021/11/24 14:31:19 tm Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -927,6 +927,7 @@ share/doc/postgresql/html/release-10-15.html
 share/doc/postgresql/html/release-10-16.html
 share/doc/postgresql/html/release-10-17.html
 share/doc/postgresql/html/release-10-18.html
+share/doc/postgresql/html/release-10-19.html
 share/doc/postgresql/html/release-10-2.html
 share/doc/postgresql/html/release-10-3.html
 share/doc/postgresql/html/release-10-4.html

databases/postgresql10-server/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2020/05/15 20:45:36 adam Exp $
+@comment $NetBSD: PLIST,v 1.9.12.1 2021/11/24 14:31:19 tm Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -617,6 +617,7 @@ share/postgresql/timezone/Pacific/Guadalcanal
 share/postgresql/timezone/Pacific/Guam
 share/postgresql/timezone/Pacific/Honolulu
 share/postgresql/timezone/Pacific/Johnston
+share/postgresql/timezone/Pacific/Kanton
 share/postgresql/timezone/Pacific/Kiritimati
 share/postgresql/timezone/Pacific/Kosrae
 share/postgresql/timezone/Pacific/Kwajalein

databases/postgresql10/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2021/08/13 11:54:43 adam Exp $
+# $NetBSD: Makefile.common,v 1.30.2.1 2021/11/24 14:31:19 tm Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql10-pltcl/Makefile
 # used by databases/postgresql10-server/Makefile
 
-DISTNAME=	postgresql-10.18
+DISTNAME=	postgresql-10.19
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2

databases/postgresql10/distinfo

@@ -1,20 +1,6 @@
-$NetBSD: distinfo,v 1.22 2021/08/13 11:54:43 adam Exp $
+$NetBSD: distinfo,v 1.22.2.1 2021/11/24 14:31:19 tm Exp $
 
-SHA1 (postgresql-10.18.tar.bz2) = a9f6d96343cc5dcf8b28e6fce5a2955041b14003
-RMD160 (postgresql-10.18.tar.bz2) = fe43854c91bf98c44c22eee2f9b014691d86bf5f
-SHA512 (postgresql-10.18.tar.bz2) = 8a564256b0a5f6375a817cc5db14e56f7f7ee831881a2dc78759e7f2cf708d95fb61ad75a01f13fb05517ab165c991794d837bbb93f60d54f4fb33ca0ac45729
-Size (postgresql-10.18.tar.bz2) = 19197042 bytes
-SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
-SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
-SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
-SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
-SHA1 (patch-contrib_uuid-ossp_Makefile) = 2eff5d539a4501dda45d23bc094a5099a456e0af
-SHA1 (patch-src_Makefile.global.in) = 335b57afff23a9684ab0a09257665810c1ba2d1e
-SHA1 (patch-src_Makefile.shlib) = 74ab026a457a4789a1aa1d6423d88ce4a2db7a2e
-SHA1 (patch-src_backend_Makefile) = 480ac63f07fec2eaacffdbee5c5aa104081d0ee4
-SHA1 (patch-src_backend_utils_adt_datetime.c) = d1ea70986634d3bfb663eff789425252656e1289
-SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = a15012ae34d4ecd1eb2bc29e4d2c40098ea236fd
-SHA1 (patch-src_interfaces_libpq_Makefile) = 61bcf84eb69b6ec9faabab0b61913766f4b20f8c
-SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
-SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
-SHA1 (patch-src_pl_plperl_plperl.h) = 64d5b891362c114bde5ec48e48bc4855b56ab516
+SHA1 (postgresql-10.19.tar.bz2) = f44edcc4d612f6a1b39c233ee7b1e80feb6d0456
+RMD160 (postgresql-10.19.tar.bz2) = 8e1fd79ea6ddd5388cca8b3a54397ced66458cce
+SHA512 (postgresql-10.19.tar.bz2) = 41b0f5026be7d563e41b54e9ea7199dd466a132d355be0b71a91d41f533d97fbf550eccf2a2ece3d60c5dab5921ebeea3ac4780c18c54b924df52d7423305a22
+Size (postgresql-10.19.tar.bz2) = 19261478 bytes

databases/postgresql11-docs/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2021/08/13 11:54:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.14.2.1 2021/11/24 14:31:19 tm Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -958,6 +958,7 @@ share/doc/postgresql/html/release-11-10.html
 share/doc/postgresql/html/release-11-11.html
 share/doc/postgresql/html/release-11-12.html
 share/doc/postgresql/html/release-11-13.html
+share/doc/postgresql/html/release-11-14.html
 share/doc/postgresql/html/release-11-2.html
 share/doc/postgresql/html/release-11-3.html
 share/doc/postgresql/html/release-11-4.html

databases/postgresql11-server/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2020/05/15 20:31:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.4.12.1 2021/11/24 14:31:19 tm Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -1271,6 +1271,7 @@ share/postgresql/timezone/Pacific/Guadalcanal
 share/postgresql/timezone/Pacific/Guam
 share/postgresql/timezone/Pacific/Honolulu
 share/postgresql/timezone/Pacific/Johnston
+share/postgresql/timezone/Pacific/Kanton
 share/postgresql/timezone/Pacific/Kiritimati
 share/postgresql/timezone/Pacific/Kosrae
 share/postgresql/timezone/Pacific/Kwajalein

databases/postgresql11/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2021/08/13 11:54:44 adam Exp $
+# $NetBSD: Makefile.common,v 1.23.2.1 2021/11/24 14:31:19 tm Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql11-pltcl/Makefile
 # used by databases/postgresql11-server/Makefile
 
-DISTNAME=	postgresql-11.13
+DISTNAME=	postgresql-11.14
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2

databases/postgresql11/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2021/08/13 11:54:44 adam Exp $
+$NetBSD: distinfo,v 1.17.2.1 2021/11/24 14:31:19 tm Exp $
 
-SHA1 (postgresql-11.13.tar.bz2) = 7c0b06bdbe2bd3d966fb7d875843f022694e9b1a
-RMD160 (postgresql-11.13.tar.bz2) = d682247742b45048c4f30f977a2402ee79396cf7
-SHA512 (postgresql-11.13.tar.bz2) = 1b2061d505a7460e0aaae53818e77fc99fa7b73eea119033a98a3d7dd3d70d00403998654990b03bbf6eb2df383e2f44791137c8922ea4015715f8bf49c5837f
-Size (postgresql-11.13.tar.bz2) = 20123787 bytes
+SHA1 (postgresql-11.14.tar.bz2) = 18c8ef5ca8314ce18f1bd10b6cd6f3e4c7099e64
+RMD160 (postgresql-11.14.tar.bz2) = ccd24b793a502c76bf48242ac04b63e61c0d3f0a
+SHA512 (postgresql-11.14.tar.bz2) = ab71461ee6fb4cdc5b4240f7ecd8af2497ce6780283fde2abf5951ffdb616bd0c8ed22b26fdfca402a346e663ff77c4d17f3284c9d700e6fd6795b2aec97c9be
+Size (postgresql-11.14.tar.bz2) = 20172910 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd

databases/postgresql12-docs/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2021/08/13 11:54:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.9.2.1 2021/11/24 14:31:19 tm Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -969,6 +969,7 @@ share/doc/postgresql/html/release-12-5.html
 share/doc/postgresql/html/release-12-6.html
 share/doc/postgresql/html/release-12-7.html
 share/doc/postgresql/html/release-12-8.html
+share/doc/postgresql/html/release-12-9.html
 share/doc/postgresql/html/release-12.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html

databases/postgresql12-server/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2020/08/14 06:56:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.5.10.1 2021/11/24 14:31:20 tm Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -1287,6 +1287,7 @@ share/postgresql/timezone/Pacific/Guadalcanal
 share/postgresql/timezone/Pacific/Guam
 share/postgresql/timezone/Pacific/Honolulu
 share/postgresql/timezone/Pacific/Johnston
+share/postgresql/timezone/Pacific/Kanton
 share/postgresql/timezone/Pacific/Kiritimati
 share/postgresql/timezone/Pacific/Kosrae
 share/postgresql/timezone/Pacific/Kwajalein

databases/postgresql12/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2021/08/13 11:54:45 adam Exp $
+# $NetBSD: Makefile.common,v 1.16.2.1 2021/11/24 14:31:20 tm Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql12-pltcl/Makefile
 # used by databases/postgresql12-server/Makefile
 
-DISTNAME=	postgresql-12.8
+DISTNAME=	postgresql-12.9
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2

databases/postgresql12/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2021/08/13 11:54:45 adam Exp $
+$NetBSD: distinfo,v 1.11.2.1 2021/11/24 14:31:20 tm Exp $
 
-SHA1 (postgresql-12.8.tar.bz2) = f3f4ae778036795bdc8f493cc7d0d15d409061e9
-RMD160 (postgresql-12.8.tar.bz2) = 10e70f2d366d6d52e6b33a8685f2e3721705ffcc
-SHA512 (postgresql-12.8.tar.bz2) = 970fe1041e427ac1c8a786c93e2079b0a9c8b3fcaf9d38877894eb02e8a9afc7cd73d7ac28078c455845a922a1b7d9c1e22cb7990d8d523dd6496af9442fba01
-Size (postgresql-12.8.tar.bz2) = 20849478 bytes
+SHA1 (postgresql-12.9.tar.bz2) = a79d8428850da50a65451e5e44771844c7f166d5
+RMD160 (postgresql-12.9.tar.bz2) = 7bdb6e85259fbb520a93f66fab82fcedee9fee2c
+SHA512 (postgresql-12.9.tar.bz2) = 11697d8283f5df5a9c74c2406e94d1b6da6df8358ad48f3b773825aab98e8395f9fd4e3fc8b1e6ebad3743c3dadbda8b795d4fe84a447d7913223e136cf2b88f
+Size (postgresql-12.9.tar.bz2) = 20904260 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd

databases/postgresql13-client/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2021/05/18 11:56:19 adam Exp $
+@comment $NetBSD: PLIST,v 1.4.4.1 2021/11/24 14:31:20 tm Exp $
 bin/clusterdb
 bin/createdb
 bin/createuser
@@ -128,6 +128,7 @@ include/postgresql/server/access/twophase.h
 include/postgresql/server/access/twophase_rmgr.h
 include/postgresql/server/access/valid.h
 include/postgresql/server/access/visibilitymap.h
+include/postgresql/server/access/visibilitymapdefs.h
 include/postgresql/server/access/xact.h
 include/postgresql/server/access/xlog.h
 include/postgresql/server/access/xlog_internal.h

databases/postgresql13-docs/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2021/08/13 11:54:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.5.2.1 2021/11/24 14:31:20 tm Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -973,6 +973,7 @@ share/doc/postgresql/html/release-13-1.html
 share/doc/postgresql/html/release-13-2.html
 share/doc/postgresql/html/release-13-3.html
 share/doc/postgresql/html/release-13-4.html
+share/doc/postgresql/html/release-13-5.html
 share/doc/postgresql/html/release-13.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html

databases/postgresql13-server/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2021/04/01 10:22:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.3.4.1 2021/11/24 14:31:20 tm Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -1288,6 +1288,7 @@ share/postgresql/timezone/Pacific/Guadalcanal
 share/postgresql/timezone/Pacific/Guam
 share/postgresql/timezone/Pacific/Honolulu
 share/postgresql/timezone/Pacific/Johnston
+share/postgresql/timezone/Pacific/Kanton
 share/postgresql/timezone/Pacific/Kiritimati
 share/postgresql/timezone/Pacific/Kosrae
 share/postgresql/timezone/Pacific/Kwajalein

databases/postgresql13/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2021/08/13 11:54:46 adam Exp $
+# $NetBSD: Makefile.common,v 1.9.2.1 2021/11/24 14:31:20 tm Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql13-pltcl/Makefile
 # used by databases/postgresql13-server/Makefile
 
-DISTNAME=	postgresql-13.4
+DISTNAME=	postgresql-13.5
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2

databases/postgresql13/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2021/08/13 11:54:46 adam Exp $
+$NetBSD: distinfo,v 1.7.2.1 2021/11/24 14:31:20 tm Exp $
 
-SHA1 (postgresql-13.4.tar.bz2) = 92146ec62ad80e8f5d2959b5cc1766311dc00d64
-RMD160 (postgresql-13.4.tar.bz2) = 8766ce228491c11629096da54dd5fd4d1c46f9ef
-SHA512 (postgresql-13.4.tar.bz2) = f1faf676ffdcee3e7f2c3b78f4badf44770d6be58090036d119d8fb0688e2b9f9159dd44fe850c179b8e23f256942c05edb8fcc385f0e852d16b37eace785b5a
-Size (postgresql-13.4.tar.bz2) = 21157443 bytes
+SHA1 (postgresql-13.5.tar.bz2) = 9321e2b01d1ffb15adae06945cb2c5f9dd671bc9
+RMD160 (postgresql-13.5.tar.bz2) = f57c343c5144d8504657e6dabddf1ec06e9359a7
+SHA512 (postgresql-13.5.tar.bz2) = c76effbca8ee63be48fa3aeb39c7038221848fe83ca2afc4e0904ba8c6a50b89aa2ad37080d4e3be75e9bdc2d6ca6dfefcda334ef55a5e1a8954bb955ce905e5
+Size (postgresql-13.5.tar.bz2) = 21186674 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = 142ba9dc85a2408802e4b9e4943b775312d577c9

databases/postgresql96-docs/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2021/08/13 11:54:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.23.2.1 2021/11/24 14:31:20 tm Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -899,6 +899,7 @@ share/doc/postgresql/html/release-9-6-20.html
 share/doc/postgresql/html/release-9-6-21.html
 share/doc/postgresql/html/release-9-6-22.html
 share/doc/postgresql/html/release-9-6-23.html
+share/doc/postgresql/html/release-9-6-24.html
 share/doc/postgresql/html/release-9-6-3.html
 share/doc/postgresql/html/release-9-6-4.html
 share/doc/postgresql/html/release-9-6-5.html

databases/postgresql96-server/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2020/05/19 07:05:28 adam Exp $
+@comment $NetBSD: PLIST,v 1.8.12.1 2021/11/24 14:31:20 tm Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -618,6 +618,7 @@ share/postgresql/timezone/Pacific/Guadalcanal
 share/postgresql/timezone/Pacific/Guam
 share/postgresql/timezone/Pacific/Honolulu
 share/postgresql/timezone/Pacific/Johnston
+share/postgresql/timezone/Pacific/Kanton
 share/postgresql/timezone/Pacific/Kiritimati
 share/postgresql/timezone/Pacific/Kosrae
 share/postgresql/timezone/Pacific/Kwajalein

databases/postgresql96/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2021/08/13 11:54:47 adam Exp $
+# $NetBSD: Makefile.common,v 1.35.2.1 2021/11/24 14:31:21 tm Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql96-pltcl/Makefile
 # used by databases/postgresql96-server/Makefile
 
-DISTNAME=	postgresql-9.6.23
+DISTNAME=	postgresql-9.6.24
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2

databases/postgresql96/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2021/08/13 11:54:47 adam Exp $
+$NetBSD: distinfo,v 1.26.2.1 2021/11/24 14:31:21 tm Exp $
 
-SHA1 (postgresql-9.6.23.tar.bz2) = d7e09dc6cb551ac7893af44e701861d72821c373
-RMD160 (postgresql-9.6.23.tar.bz2) = 59a9ca18b3085a23654d491d91f12c6abd0b2d31
-SHA512 (postgresql-9.6.23.tar.bz2) = 205b47cf1c22519092f840a9b3bf6bdf95f455e5ba02a7e1bc1495f85bb25f8ccfe9f60c83dc2801f1366b88fc35e64c23eb9bdc89a4bb5d233243af4606d59c
-Size (postgresql-9.6.23.tar.bz2) = 19013235 bytes
+SHA1 (postgresql-9.6.24.tar.bz2) = 4a329b3bc5e88dccd37cf75955b6f7d5786890af
+RMD160 (postgresql-9.6.24.tar.bz2) = 8751d98bc0cd732265063fd27ee325619aa96ecc
+SHA512 (postgresql-9.6.24.tar.bz2) = c17ef8e7149bd136f6058e20b28f9a7307625614e37ff837feb7a6fa37b6932dfab6379285120c9bb0198961eb446c9979d5ee1f3e8583b09f981f52bee33505
+Size (postgresql-9.6.24.tar.bz2) = 19047518 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
 SHA1 (patch-configure) = db34614cef013a91dc229be319e5f09c657c3f24

databases/redis/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2021/07/22 09:56:54 adam Exp $
+# $NetBSD: Makefile,v 1.71.2.1 2021/10/06 21:12:46 tm Exp $
 
-DISTNAME=	redis-6.2.5
+DISTNAME=	redis-6.2.6
 CATEGORIES=	databases
 MASTER_SITES=	http://download.redis.io/releases/
 

databases/redis/distinfo

@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.62 2021/07/22 09:56:54 adam Exp $
+$NetBSD: distinfo,v 1.62.2.1 2021/10/06 21:12:46 tm Exp $
 
-SHA1 (redis-6.2.5.tar.gz) = b675f5e883f095c2081f605e3ca31a6d5832383c
-RMD160 (redis-6.2.5.tar.gz) = 1c0d20f2c57d2cb0918e58b36a584ecaa3d8d9b0
-SHA512 (redis-6.2.5.tar.gz) = 8c54451032cbb627ec2827251556cba2010e56544baca7ea117b5afd2c2add484acbedd3baf21bdb8fd10672602cf52294a4e26b135c1406d7a723c048275e3a
-Size (redis-6.2.5.tar.gz) = 2465302 bytes
+SHA1 (redis-6.2.6.tar.gz) = e9fb68dfcee194b438bd0af6e4cbc277a2a425e2
+RMD160 (redis-6.2.6.tar.gz) = 98607041365692d7feb19bf861b4bb32e799047e
+SHA512 (redis-6.2.6.tar.gz) = 9b947d26fd9e208627ed22d318ab3d0775ab0be46d98db1c1d158feac671b984e75ce33e647d196face9643f80768af47e678be1b4e1ddd3eb56dff467c46022
+Size (redis-6.2.6.tar.gz) = 2476542 bytes
 SHA1 (patch-redis.conf) = ee657a9d82711263ceb0fb8f7d8059ed23528fe9
-SHA1 (patch-src_Makefile) = b74e1575d423b9a4d09b6b5e3eeb355d79c27855
+SHA1 (patch-src_Makefile) = 0b6f68bbb2cbf9aad655611bdd9aee8f3ed4e850
 SHA1 (patch-src_hyperloglog.c) = e9bdd3c630024a6fbe02c2c1d85e26131ad938cf
 SHA1 (patch-src_object.c) = 30ffaec9c7e6135e3a5576cd1a35d7bcec668299

databases/redis/patches/patch-src_Makefile

@@ -1,11 +1,11 @@
-$NetBSD: patch-src_Makefile,v 1.4 2021/03/01 13:19:19 adam Exp $
+$NetBSD: patch-src_Makefile,v 1.4.6.1 2021/10/06 21:12:46 tm Exp $
 
 Add DESTDIR support.
 Fix NetBSD support.
 
---- src/Makefile.orig	2021-02-22 21:23:58.000000000 +0000
+--- src/Makefile.orig	2021-10-04 10:59:40.000000000 +0000
 +++ src/Makefile
-@@ -40,8 +40,8 @@ else
+@@ -45,8 +45,8 @@ else
  endif
  
  PREFIX?=/usr/local
@@ -16,7 +16,7 @@ Fix NetBSD support.
  PKG_CONFIG?=pkg-config
  
  # Default allocator defaults to Jemalloc if it's not an ARM
-@@ -152,6 +152,10 @@ ifeq ($(uname_S),NetBSD)
+@@ -151,6 +151,10 @@ ifeq ($(uname_S),NetBSD)
  	    FINAL_LIBS+= -lexecinfo
      	endif
  else
@@ -27,11 +27,11 @@ Fix NetBSD support.
  ifeq ($(uname_S),FreeBSD)
  	# FreeBSD
  	FINAL_LIBS+= -lpthread -lexecinfo
-@@ -187,6 +191,7 @@ endif
+@@ -186,6 +190,7 @@ endif
  endif
  endif
  endif
 +endif
- # Include paths to dependencies
- FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
  
+ ifdef OPENSSL_PREFIX
+ 	OPENSSL_CFLAGS=-I$(OPENSSL_PREFIX)/include

databases/sqlite3/Makefile

@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.141 2021/06/25 21:21:31 adam Exp $
+# $NetBSD: Makefile,v 1.141.2.1 2021/10/17 10:12:02 tm Exp $
 
 .include "Makefile.common"
 
 DISTNAME=	sqlite-autoconf-${SQLITE3_DISTVERSION}
 PKGNAME=	sqlite3-${SQLITE3_VERSION}
+PKGREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

databases/sqlite3/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.171 2021/06/25 21:21:31 adam Exp $
+$NetBSD: distinfo,v 1.171.2.1 2021/10/17 10:12:02 tm Exp $
 
 SHA1 (sqlite-autoconf-3360000.tar.gz) = a4bcf9e951bfb9745214241ba08476299fc2dc1e
 RMD160 (sqlite-autoconf-3360000.tar.gz) = ef34b98fbe1f3436fc0d1255ae2fa9a660011cb2
 SHA512 (sqlite-autoconf-3360000.tar.gz) = e59c57f421b4956c7759af528a2da929167e15179ab9d28267474683e2272f93c901203e5a648732f1a3d43e7be3ac4217c3cdd7adf108c378b9127b771a7cd0
 Size (sqlite-autoconf-3360000.tar.gz) = 2977080 bytes
 SHA1 (patch-configure) = c0aa83bddc20d090b3cd2fd840ac69031f4396e4
+SHA1 (patch-shell.c) = d20cddef6cf75753c78d95b7dd1ae928caba5df6

databases/sqlite3/patches/patch-shell.c

@@ -0,0 +1,48 @@
+$NetBSD: patch-shell.c,v 1.1.2.2 2021/10/17 10:12:03 tm Exp $
+
+Fix Segmentation fault in idxGetTableInfo (CVE-2021-36690)
+https://sqlite.org/src/info/b1e0c22ec981cf5f
+
+--- shell.c.orig	2021-06-18 18:52:24.000000000 +0000
++++ shell.c
+@@ -9852,11 +9852,13 @@ static int idxGetTableInfo(
+   rc = idxPrintfPrepareStmt(db, &p1, pzErrmsg, "PRAGMA table_xinfo=%Q", zTab);
+   while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(p1) ){
+     const char *zCol = (const char*)sqlite3_column_text(p1, 1);
++    const char *zColSeq = 0;
+     nByte += 1 + STRLEN(zCol);
+     rc = sqlite3_table_column_metadata(
+-        db, "main", zTab, zCol, 0, &zCol, 0, 0, 0
++        db, "main", zTab, zCol, 0, &zColSeq, 0, 0, 0
+     );
+-    nByte += 1 + STRLEN(zCol);
++    if( zColSeq==0 ) zColSeq = "binary";
++    nByte += 1 + STRLEN(zColSeq);
+     nCol++;
+     nPk += (sqlite3_column_int(p1, 5)>0);
+   }
+@@ -9876,6 +9878,7 @@ static int idxGetTableInfo(
+   nCol = 0;
+   while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(p1) ){
+     const char *zCol = (const char*)sqlite3_column_text(p1, 1);
++    const char *zColSeq = 0;
+     int nCopy = STRLEN(zCol) + 1;
+     pNew->aCol[nCol].zName = pCsr;
+     pNew->aCol[nCol].iPk = (sqlite3_column_int(p1, 5)==1 && nPk==1);
+@@ -9883,12 +9886,13 @@ static int idxGetTableInfo(
+     pCsr += nCopy;
+ 
+     rc = sqlite3_table_column_metadata(
+-        db, "main", zTab, zCol, 0, &zCol, 0, 0, 0
++        db, "main", zTab, zCol, 0, &zColSeq, 0, 0, 0
+     );
+     if( rc==SQLITE_OK ){
+-      nCopy = STRLEN(zCol) + 1;
++      if( zColSeq==0 ) zColSeq = "binary";
++      nCopy = STRLEN(zColSeq) + 1;
+       pNew->aCol[nCol].zColl = pCsr;
+-      memcpy(pCsr, zCol, nCopy);
++      memcpy(pCsr, zColSeq, nCopy);
+       pCsr += nCopy;
+     }
+ 

devel/apache-maven/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2020/06/29 12:39:54 yyamano Exp $
-#
+# $NetBSD: Makefile,v 1.17.10.1 2021/10/16 20:29:42 tm Exp $
 
-DISTNAME=	apache-maven-3.6.3
+DISTNAME=	apache-maven-3.8.3
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:=maven/maven-3/${PKGVERSION_NOREV}/binaries/}
 DISTFILES=	${DISTNAME}-bin${EXTRACT_SUFX}

devel/apache-maven/PLIST

@@ -1,17 +1,15 @@
-@comment $NetBSD: PLIST,v 1.11 2020/06/29 12:39:54 yyamano Exp $
+@comment $NetBSD: PLIST,v 1.11.10.1 2021/10/16 20:29:42 tm Exp $
 bin/mvn
 lib/java/maven/boot/plexus-classworlds-2.6.0.jar
-lib/java/maven/cdi-api-1.0.jar
 lib/java/maven/commons-cli-1.4.jar
-lib/java/maven/commons-io-2.5.jar
+lib/java/maven/commons-io-2.6.jar
 lib/java/maven/commons-lang3-3.8.1.jar
 lib/java/maven/guava-25.1-android.jar
-lib/java/maven/guice-4.2.1-no_aop.jar
-lib/java/maven/jansi-1.17.1.jar
+lib/java/maven/guice-4.2.2-no_aop.jar
+lib/java/maven/jansi-2.3.4.jar
+lib/java/maven/javax.annotation-api-1.2.jar
 lib/java/maven/javax.inject-1.jar
-lib/java/maven/jcl-over-slf4j-1.7.29.jar
-lib/java/maven/jsoup-1.12.1.jar
-lib/java/maven/jsr250-api-1.0.jar
+lib/java/maven/jcl-over-slf4j-1.7.32.jar
 lib/java/maven/maven-artifact-${PKGVERSION}.jar
 lib/java/maven/maven-builder-support-${PKGVERSION}.jar
 lib/java/maven/maven-compat-${PKGVERSION}.jar
@@ -21,28 +19,28 @@ lib/java/maven/maven-model-${PKGVERSION}.jar
 lib/java/maven/maven-model-builder-${PKGVERSION}.jar
 lib/java/maven/maven-plugin-api-${PKGVERSION}.jar
 lib/java/maven/maven-repository-metadata-${PKGVERSION}.jar
-lib/java/maven/maven-resolver-api-1.4.1.jar
-lib/java/maven/maven-resolver-connector-basic-1.4.1.jar
-lib/java/maven/maven-resolver-impl-1.4.1.jar
+lib/java/maven/maven-resolver-api-1.6.3.jar
+lib/java/maven/maven-resolver-connector-basic-1.6.3.jar
+lib/java/maven/maven-resolver-impl-1.6.3.jar
 lib/java/maven/maven-resolver-provider-${PKGVERSION}.jar
-lib/java/maven/maven-resolver-spi-1.4.1.jar
-lib/java/maven/maven-resolver-transport-wagon-1.4.1.jar
-lib/java/maven/maven-resolver-util-1.4.1.jar
+lib/java/maven/maven-resolver-spi-1.6.3.jar
+lib/java/maven/maven-resolver-transport-wagon-1.6.3.jar
+lib/java/maven/maven-resolver-util-1.6.3.jar
 lib/java/maven/maven-settings-${PKGVERSION}.jar
 lib/java/maven/maven-settings-builder-${PKGVERSION}.jar
-lib/java/maven/maven-shared-utils-3.2.1.jar
+lib/java/maven/maven-shared-utils-3.3.4.jar
 lib/java/maven/maven-slf4j-provider-${PKGVERSION}.jar
-lib/java/maven/org.eclipse.sisu.inject-0.3.4.jar
-lib/java/maven/org.eclipse.sisu.plexus-0.3.4.jar
-lib/java/maven/plexus-cipher-1.7.jar
+lib/java/maven/org.eclipse.sisu.inject-0.3.5.jar
+lib/java/maven/org.eclipse.sisu.plexus-0.3.5.jar
+lib/java/maven/plexus-cipher-2.0.jar
 lib/java/maven/plexus-component-annotations-2.1.0.jar
-lib/java/maven/plexus-interpolation-1.25.jar
-lib/java/maven/plexus-sec-dispatcher-1.4.jar
-lib/java/maven/plexus-utils-3.2.1.jar
-lib/java/maven/slf4j-api-1.7.29.jar
-lib/java/maven/wagon-file-3.3.4.jar
-lib/java/maven/wagon-http-3.3.4-shaded.jar
-lib/java/maven/wagon-provider-api-3.3.4.jar
+lib/java/maven/plexus-interpolation-1.26.jar
+lib/java/maven/plexus-sec-dispatcher-2.0.jar
+lib/java/maven/plexus-utils-3.3.0.jar
+lib/java/maven/slf4j-api-1.7.32.jar
+lib/java/maven/wagon-file-3.4.3.jar
+lib/java/maven/wagon-http-3.4.3-shaded.jar
+lib/java/maven/wagon-provider-api-3.4.3.jar
 share/doc/java/maven/LICENSE
 share/doc/java/maven/NOTICE
 share/doc/java/maven/README.txt

devel/apache-maven/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2020/06/29 12:39:54 yyamano Exp $
+$NetBSD: distinfo,v 1.18.10.1 2021/10/16 20:29:42 tm Exp $
 
-SHA1 (apache-maven-3.6.3-bin.tar.gz) = cc836dc7e64b113472df31996caaedf132969009
-RMD160 (apache-maven-3.6.3-bin.tar.gz) = 825e2cca16a72da4bb0a4b5add615e155623c05e
-SHA512 (apache-maven-3.6.3-bin.tar.gz) = c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
-Size (apache-maven-3.6.3-bin.tar.gz) = 9506321 bytes
+SHA1 (apache-maven-3.8.3-bin.tar.gz) = cbd24fbfa9845e72f1ca01b8571b5db5bde6c333
+RMD160 (apache-maven-3.8.3-bin.tar.gz) = 4b7b377a826109775cf6dfb3a9f7fac65842ee66
+SHA512 (apache-maven-3.8.3-bin.tar.gz) = 1c12a5df43421795054874fd54bb8b37d242949133b5bf6052a063a13a93f13a20e6e9dae2b3d85b9c7034ec977bbc2b6e7f66832182b9c863711d78bfe60faa
+Size (apache-maven-3.8.3-bin.tar.gz) = 9042049 bytes
 SHA1 (patch-bin_m2.conf) = 4fb50adbfb744635281853f0b81ec95a5fdab504
-SHA1 (patch-bin_mvn) = 30a0eb33a803eb3ace2f602f6fbb184c9bdeb969
+SHA1 (patch-bin_mvn) = 2efaaa95837cc0a626161d5fb9903e0a3f353c0f

devel/apache-maven/patches/patch-bin_mvn

@@ -1,12 +1,12 @@
-$NetBSD: patch-bin_mvn,v 1.8 2020/05/22 04:31:48 markd Exp $
+$NetBSD: patch-bin_mvn,v 1.8.12.1 2021/10/16 20:29:42 tm Exp $
 
 Reconcile JAVA_HOME evaluated at run time on Darwin vs. hardcoded
 via PKG_JAVA_HOME elsewhere.
 Follow pkgsrc path convention.
 
---- bin/mvn.orig	2018-06-17 18:30:11.000000000 +0000
+--- bin/mvn.orig	2021-09-27 18:25:22.000000000 +0000
 +++ bin/mvn
-@@ -42,9 +42,11 @@ fi
+@@ -46,9 +46,11 @@ fi
  # OS specific support. $var _must_ be set to either true or false.
  cygwin=false;
  mingw=false;
@@ -18,7 +18,7 @@ Follow pkgsrc path convention.
  esac
  
  ## resolve links - $0 may be a link to Maven's home
-@@ -89,12 +91,17 @@ if $mingw ; then
+@@ -93,19 +95,24 @@ if $mingw ; then
    # TODO classpath?
  fi
  
@@ -37,9 +37,8 @@ Follow pkgsrc path convention.
 +JAVACMD="$JAVA_HOME/bin/java"
 +
  if [ ! -x "$JAVACMD" ] ; then
-   echo "The JAVA_HOME environment variable is not defined correctly" >&2
-   echo "This environment variable is needed to run this program" >&2
-@@ -102,7 +109,7 @@ if [ ! -x "$JAVACMD" ] ; then
+   echo "The JAVA_HOME environment variable is not defined correctly," >&2
+   echo "this environment variable is needed to run this program." >&2
    exit 1
  fi
  
@@ -48,7 +47,7 @@ Follow pkgsrc path convention.
  CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
  
  # For Cygwin, switch paths to Windows format before running java
-@@ -192,8 +199,10 @@ exec "$JAVACMD" \
+@@ -195,8 +202,10 @@ exec "$JAVACMD" \
    $MAVEN_OPTS \
    $MAVEN_DEBUG_OPTS \
    -classpath "${CLASSWORLDS_JAR}" \

devel/gmp/Makefile

@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.88 2020/11/16 13:12:41 wiz Exp $
+# $NetBSD: Makefile,v 1.88.8.1 2021/11/27 21:43:55 tm Exp $
 
 DISTNAME=	gmp-6.2.1
+PKGREVISION=	1
 CATEGORIES=	devel math
 MASTER_SITES=	https://gmplib.org/download/gmp/
 MASTER_SITES+=	${MASTER_SITE_GNU:=gmp/}

devel/gmp/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.56 2020/11/16 13:12:41 wiz Exp $
+$NetBSD: distinfo,v 1.56.8.1 2021/11/27 21:43:55 tm Exp $
 
 SHA1 (gmp-6.2.1.tar.bz2) = 2dcf34d4a432dbe6cce1475a835d20fe44f75822
 RMD160 (gmp-6.2.1.tar.bz2) = 2a4204453eb608bec6bb647ff5a0c47ca4d43878
 SHA512 (gmp-6.2.1.tar.bz2) = 8904334a3bcc5c896ececabc75cda9dec642e401fb5397c4992c4fabea5e962c9ce8bd44e8e4233c34e55c8010cc28db0545f5f750cbdbb5f00af538dc763be9
 Size (gmp-6.2.1.tar.bz2) = 2493916 bytes
 SHA1 (patch-acinclude.m4) = 3f76c0aa8d29ec815a93448f9c4bc976ebdf7a2a
+SHA1 (patch-mpz_inp__raw.c) = d25995039d4c7226b5209cb932c13fe59a4578ca

devel/gmp/patches/patch-mpz_inp__raw.c

@@ -0,0 +1,20 @@
+$NetBSD: patch-mpz_inp__raw.c,v 1.1.2.2 2021/11/27 21:43:55 tm Exp $
+
+Fix for CVE-2021-43618
+https://gmplib.org/repo/gmp-6.2/rev/561a9c25298e
+
+--- mpz/inp_raw.c.orig	2020-11-14 18:45:09.000000000 +0000
++++ mpz/inp_raw.c
+@@ -88,8 +88,11 @@ mpz_inp_raw (mpz_ptr x, FILE *fp)
+ 
+   abs_csize = ABS (csize);
+ 
++  if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8))
++    return 0; /* Bit size overflows */
++
+   /* round up to a multiple of limbs */
+-  abs_xsize = BITS_TO_LIMBS (abs_csize*8);
++  abs_xsize = BITS_TO_LIMBS ((mp_bitcnt_t) abs_csize * 8);
+ 
+   if (abs_xsize != 0)
+     {

devel/libFoundation/patches/patch-aa

@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/04/18 02:27:21 rh Exp $
+$NetBSD: patch-aa,v 1.1 2009/04/18 02:19:23 rh Exp $
 
---- GNUmakefile.orig	2009-04-18 11:56:31.000000000 +1000
+--- GNUmakefile.orig	2009-04-18 10:49:03.000000000 +1000
 +++ GNUmakefile
 @@ -38,7 +38,7 @@ GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
  include $(GNUSTEP_MAKEFILES)/common.make
  include ./Version
  
 -SUBPROJECTS = Foundation Resources examples
-+SUBPROJECTS = examples
++SUBPROJECTS = Foundation Resources
  
  include $(GNUSTEP_MAKEFILES)/aggregate.make
  

devel/ncurses/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.110 2021/05/24 19:50:02 wiz Exp $
+# $NetBSD: Makefile,v 1.110.4.1 2021/10/16 18:52:07 tm Exp $
 
 .include "Makefile.common"
-PKGREVISION=	3
+PKGREVISION=	4
 
 COMMENT=	CRT screen handling and optimization package
 

devel/ncurses/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2020/09/07 11:11:41 schmonz Exp $
+$NetBSD: distinfo,v 1.46.10.1 2021/10/16 18:52:07 tm Exp $
 
 SHA1 (ncurses-6.2.tar.gz) = 56e410fb77f2b5501a0b2f6a995376f3cefe1097
 RMD160 (ncurses-6.2.tar.gz) = bedfe81f33b3e55e44d14126c9c2821d7f222701
@@ -10,4 +10,5 @@ SHA1 (patch-misc_run__tic.in) = a6a8dd89da1a2fbbc5fcabfa6d41ce3a41b75722
 SHA1 (patch-misc_terminfo.src) = d9eede4b159358f396693141ed9d9c2a76647917
 SHA1 (patch-mk-1st.awk) = adf9d68ee565da80078cfcfa8969a4ef806d65de
 SHA1 (patch-ncurses_base_lib_initscr.c) = e514e2bb4862a2617b30c6ad715bc1c50cb76f0e
+SHA1 (patch-ncurses_tinfo_captoinfo.c) = d0c39b510b44088d5ea26be10711fc21de1d2ecd
 SHA1 (patch-ncurses_tinfo_lib_raw.c) = 5aa2d439b8f5c3ce87863095396848c923c864d0

devel/ncurses/patches/patch-ncurses_tinfo_captoinfo.c

@@ -0,0 +1,26 @@
+$NetBSD: patch-ncurses_tinfo_captoinfo.c,v 1.1.2.2 2021/10/16 18:52:07 tm Exp $
+
+Fix for CVE-2021-39537 from upstream:
+https://github.com/ThomasDickey/ncurses-snapshots/commit/63ca9e061f4644795d6f3f559557f3e1ed8c738b#diff-7e95c7bc5f213e9be438e69a9d5d0f261a14952bcbd692f7b9014217b8047340
+
+--- ncurses/tinfo/captoinfo.c.orig	2020-02-02 23:34:34.000000000 +0000
++++ ncurses/tinfo/captoinfo.c
+@@ -216,12 +216,15 @@ cvtchar(register const char *sp)
+ 	}
+ 	break;
+     case '^':
++	len = 2;
+ 	c = UChar(*++sp);
+-	if (c == '?')
++        if (c == '?') {
+ 	    c = 127;
+-	else
++        } else if (c == '\0') {
++            len = 1;
++        } else {
+ 	    c &= 0x1f;
+-	len = 2;
++	}
+ 	break;
+     default:
+ 	c = UChar(*sp);

devel/nss/Makefile

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.214 2021/09/05 09:06:33 wiz Exp $
+# $NetBSD: Makefile,v 1.214.2.1 2021/12/05 07:32:02 spz Exp $
 #
 # release notes
 # https://firefox-source-docs.mozilla.org/security/nss/releases/index.html
 
 DISTNAME=		nss-${NSS_RELEASE:S/.0$//}
-NSS_RELEASE=		3.70.0
+NSS_RELEASE=		3.73.0
 CATEGORIES=		devel security
 MASTER_SITES=		${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_DIST_DIR_VERSION:S/_0$//}_RTM/src/}
 

devel/nss/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.138 2021/09/05 09:06:33 wiz Exp $
+$NetBSD: distinfo,v 1.138.2.1 2021/12/05 07:32:02 spz Exp $
 
-SHA1 (nss-3.70.tar.gz) = 55fa81782b8666607673210a7682de0a643d5976
-RMD160 (nss-3.70.tar.gz) = 308700c69b7b7d3dfe94d7340f6256d345ff98ff
-SHA512 (nss-3.70.tar.gz) = 9766282b36560d2f73ac5e90dbc3962802d6b1e8650ff9c0afbd6d2e1ff4cf8f2bc251f972344dc8a6ac5209b917aae03cc9883cb081011a7dea7bd258a95d82
-Size (nss-3.70.tar.gz) = 83917362 bytes
+SHA1 (nss-3.73.tar.gz) = 7efb2895e4480b2765e444bf44a4e9d55df8f17c
+RMD160 (nss-3.73.tar.gz) = f37bb5d89d92c971ab49d0e7f8b6a95a4ae7462d
+SHA512 (nss-3.73.tar.gz) = 84b6e4ce8838f77674a5587cd227fa103c80f1b36c8bfb9b60a175157f131e59153c79ee77b29feffa57f49b217a90a8a091ee368eb0bc03312894e386a4c01b
+Size (nss-3.73.tar.gz) = 83928905 bytes
 SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1
 SHA1 (patch-me) = ffb5f119764c158c0bd789bd18fc77c61f2e9d2b
 SHA1 (patch-mf) = 40e58385fb6f944f463bf00b9aad72bc4ea229d0

devel/ruby-redmine41/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/08/22 06:40:24 taca Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2021/11/23 22:34:04 tm Exp $
 
 DISTNAME=	redmine-${RM_VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/redmine/redmine${RM_VER}/}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://www.redmine.org/
 COMMENT=	Flexible project management web application
 LICENSE=	gnu-gpl-v2 # and so on.
 
-RM_VERSION=	4.1.4
+RM_VERSION=	4.1.5
 
 NO_BUILD=	yes
 

devel/ruby-redmine41/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2021/08/22 06:36:30 taca Exp $
+$NetBSD: distinfo,v 1.4.2.1 2021/11/23 22:34:04 tm Exp $
 
-SHA1 (redmine-4.1.4.tar.gz) = d29f1899b07ec82f98a5fc11cecfed315f0be25c
-RMD160 (redmine-4.1.4.tar.gz) = 971d95d784969723045dfde6999581a02eb1ef9e
-SHA512 (redmine-4.1.4.tar.gz) = 93e46f2ed220c05b83b7bab34327891a7f05a46a01c6cbfc1a5c9bf18613e308d94d84fc3158a8bb7af740b8792448d935bc9d29795ee341bca577c82ac0619b
-Size (redmine-4.1.4.tar.gz) = 2720709 bytes
+SHA1 (redmine-4.1.5.tar.gz) = aea70f86149ddb396c103f50daba5fd98a255914
+RMD160 (redmine-4.1.5.tar.gz) = 8a2aeb3a9c7203aad71d0229d421d10cc0aeedfb
+SHA512 (redmine-4.1.5.tar.gz) = cf4020bff11b13986989e312db1e7ee459f4391ec7326f59a4f493fb0c95be87d19196377da60ac083801b7c792dc012769350b684e20dd887c431c0c18cc851
+Size (redmine-4.1.5.tar.gz) = 2722929 bytes
 SHA1 (patch-Gemfile) = 5dec9dd49f9a33b3148b5e9ea5d2d3c8521716c7
 SHA1 (patch-lib_tasks_initializers.rake) = 73c4594c94abd28e628bbd172565b161f0e54fff

devel/ruby-redmine42/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/08/22 06:43:44 taca Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2021/11/23 22:31:45 tm Exp $
 
 DISTNAME=	redmine-${RM_VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/redmine/redmine${RM_VER}/}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://www.redmine.org/
 COMMENT=	Flexible project management web application
 LICENSE=	gnu-gpl-v2 # and so on.
 
-RM_VERSION=	4.2.2
+RM_VERSION=	4.2.3
 
 NO_BUILD=	yes
 

devel/ruby-redmine42/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2021/08/22 06:43:44 taca Exp $
+$NetBSD: distinfo,v 1.2.2.1 2021/11/23 22:31:45 tm Exp $
 
-SHA1 (redmine-4.2.2.tar.gz) = 7f5589dccc231c5be6cf6f94fc958cb5a380d8cb
-RMD160 (redmine-4.2.2.tar.gz) = 1621ebb047b86546a5036de6823cde166731a174
-SHA512 (redmine-4.2.2.tar.gz) = 71155358ca68d9eb5bf6b79e26202c29ba3355d499662bfe659ff1672625a25d91694d5f1e4bb8db18456642470244aca914efe4456adef2850b70ff7eb216b2
-Size (redmine-4.2.2.tar.gz) = 3038398 bytes
+SHA1 (redmine-4.2.3.tar.gz) = 7ecf72c670fe04ca21d43750b6e63b5f1cd0bf1d
+RMD160 (redmine-4.2.3.tar.gz) = 5a860bb528f528ab31cc631166d964c7c1d7133c
+SHA512 (redmine-4.2.3.tar.gz) = 456117b0d5d72ee58c87def84327e29f79937fa71098b48a80103e3e6653648c0df46afcc4f533803384ba7413e690538deeee33e263d86dd9e4e5dec65144e3
+Size (redmine-4.2.3.tar.gz) = 3039136 bytes
 SHA1 (patch-Gemfile) = 69944d34bc7e304609dc5c6c9b894e29be065d19
 SHA1 (patch-lib_tasks_initializers.rake) = 73c4594c94abd28e628bbd172565b161f0e54fff

doc/CHANGES-pkgsrc-2021Q3

@@ -0,0 +1,164 @@
+$NetBSD: CHANGES-pkgsrc-2021Q3,v 1.1.2.46 2021/12/14 17:45:13 tm Exp $
+
+Changes to packages and infrastructure on the pkgsrc-2021Q3 branch:
+
+Pullup ticket #6502 - requested by wiz
+graphics/libexif: security fix
+
+Pullup ticket #6501 - requested by bsiegert
+net/tigervnc: Bugfix for X11R7 fonts
+
+Pullup ticket #6500 - requested by bsiegert
+print/ghostscript-agpl: Bugfix, undefined reference error during link
+
+Pullup ticket #6503 - requested by taca
+databases/redis: security fix
+
+Pullup ticket #6504 - requested by taca
+www/apache24: security fix
+
+Pullup ticket #6505 - requested by wiz
+security/tor-browser: bugfix
+
+Pullup ticket #6507 - requested by tm
+net/rsync: security fix
+
+Pullup ticket #6506 - requested by taca
+apache24: security fix
+
+Pullup ticket #6510 - requested by nia
+x11/mate-applets: bugfix for non-x86
+
+Pullup ticket #6508 - requested by nia
+www/firefox78: security fix
+www/firefox78-l10n: dependent update
+
+Pullup ticket #6509 - requested by nia
+www/firefox91: security fix
+www/firefox91-l10n: dependent update
+
+Pullup ticket #6511 - requested by tm
+databases/hiredis: security fix
+
+Pullup ticket #6512 - requested by mlelstv
+print/ghostscript-agpl: pullup and build fix
+
+Pullup ticket #6513 - requested by gutteridge
+lang/python27: security fix
+
+Pullup ticket #6514 - requested by wiz
+mail/neomutt: security fix
+
+Pullup ticket #6515 - requested by wiz
+databases/p5-DBI: security fix
+
+Pullup ticket #6516 - requested by wiz
+multimedia/libmediainfo: security fix
+multimedia/mediainfo: security fix
+
+Pullup ticket #6517 - requested by wiz
+devel/ncurses: security fix
+
+Pullup ticket #6518 - requested by wiz
+devel/apache-maven: security fix
+
+Pullup ticket #6519 - requested by nia
+graphics/pfstools: build fix
+
+Pullup ticket #6520 - requested by wiz
+databases/sqlite3: segfault fix
+
+Pullup ticket #6522 - requested by nia
+mail/balsa: security fix
+
+Pullup ticket #6521 - requested by nia
+mail/alpine: security fix
+
+Pullup ticket #6528 - requested by taca
+lang/php73: security fix
+
+Pullup ticket #6524 - requested by taca
+net/bind911: security fix
+
+Pullup ticket #6525 - requested by taca
+net/bind916: security fix
+
+Pullup ticket #6527 - requested by taca
+lang/php74: security fix
+
+Pullup ticket #6526 - requested by taca
+lang/php80: security fix
+
+Pullup ticket #6523 - requested by gutteridge
+lang/python27: bugfix
+
+Pullup ticket #6529 - requested by nia
+firefox91-l10n: dependent update
+
+Pullup ticket #6530 - requested by nia
+www/firefox91: security fix
+
+Pullup ticket #6534 - requested by bsiegert
+mail/mailman: security fix
+
+Pullup ticket #6532 - requested by bsiegert
+net/zeromq: security fix
+
+Pullup ticket #6533 - requested by bsiegert
+www/ap2-auth-mellon: security fix
+
+Pullup ticket #6539 - requested by taca
+devel/ruby-redmine42: security fix
+
+Pullup ticket #6540 - requested by taca
+devel/ruby-redmine41: security fix
+
+Pullup ticket #6541 - requested by taca
+lang/php74: security fix
+
+Pullup ticket #6542 - requested by taca
+lang/php73: security fix
+
+Pullup ticket #6543 - requested by taca
+lang/php80: security fix
+
+Pullup ticket #6536 - requested by taca
+databases/ldb: dependency for samba4 security fix
+
+Pullup ticket #6537 - requested by taca
+net/samba4: security fix
+
+Pullup ticket #6535 - requested by bsiegert
+databases/postgresql: security fix
+
+Pullup ticket #6538 - requested by gdt
+chat/matrix-synapse: security update
+
+Pullup ticket #6544 - requested by wiz
+devel/gmp: security fix
+
+Pullup ticket #6545 - requested by taca
+lang/ruby26-base: security fix
+
+Pullup ticket #6546 - requested by taca
+lang/ruby27-base: security fix
+
+Pullup ticket #6547 - requested by taca
+lang/ruby30-base: security fix
+
+Pullup ticket #6548 - requested by mlelstv
+devel/nss: security-update
+
+Pullup ticket #6549 - requested by nia
+databases/mariadb105: security fix
+
+Pullup ticket #6550 - requested by nia
+databases/mariadb106: security fix
+
+Pullup ticket #6551 - requested by nia
+databases/mariadb105: fix PLIST on SunOS
+databases/mariadb106: fix PLIST on SunOS
+
+Pullup ticket #6552 - requested by nia
+www/firefox91: security fix
+

graphics/libexif/Makefile

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.48 2020/05/19 11:20:00 nia Exp $
+# $NetBSD: Makefile,v 1.48.12.1 2021/10/03 17:55:56 bsiegert Exp $
 
-DISTNAME=	libexif-0.6.22
+DISTNAME=	libexif-0.6.23
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libexif/}
 GITHUB_PROJECT=	libexif
-GITHUB_RELEASE=	${DISTNAME:S/./_/g}-release
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	adam@NetBSD.org

graphics/libexif/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.32 2020/05/19 11:20:00 nia Exp $
+$NetBSD: distinfo,v 1.32.12.1 2021/10/03 17:55:56 bsiegert Exp $
 
-SHA1 (libexif-0.6.22.tar.xz) = b396c562dbf44567ef796f324e7760b15e657523
-RMD160 (libexif-0.6.22.tar.xz) = e34ce907a658d4883894655bd11c6dff2b06cf9d
-SHA512 (libexif-0.6.22.tar.xz) = 0a9e7bf0258ed98a794b667d45e8fc65299101a2a2d2e39c358715b20b003beff258782f0736cd5b53978428a2f878a989f303bee249a978850a065f33c534af
-Size (libexif-0.6.22.tar.xz) = 1347040 bytes
+SHA1 (libexif-0.6.23.tar.xz) = e8439ad25f19b53874b685c3a9e80e6d883c1b2a
+RMD160 (libexif-0.6.23.tar.xz) = e6950f3939bb63f9782933bfa6b6741110a998aa
+SHA512 (libexif-0.6.23.tar.xz) = bf8adbe91ae14a69a83d16712c6067b06b05dfe2af66badf0de3414ee214c1d79a16529eb17bcdbac41ef8e9701d9e2c7a7ea4531e939af4050f9781b8302751
+Size (libexif-0.6.23.tar.xz) = 1327916 bytes

graphics/pfstools/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2021/08/15 14:24:02 wiz Exp $
+# $NetBSD: Makefile,v 1.76.2.1 2021/10/16 20:55:16 tm Exp $
 
 DISTNAME=	pfstools-2.1.0
 PKGREVISION=	19
@@ -40,7 +40,6 @@ SUBST_SED.perl=		-e 's,@PERL_PATH@,${PERL5},g'
 
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/netpbm/buildlink3.mk"
-.include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"

graphics/pfstools/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/12/15 21:32:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.5.16.1 2021/10/16 20:55:16 tm Exp $
 bin/dcraw2hdrgen
 bin/jpeg2hdrgen
 bin/pfsabsolute
@@ -14,7 +14,6 @@ ${PLIST.gl}bin/pfsglview
 bin/pfshdrcalibrate
 bin/pfsin
 bin/pfsindcraw
-bin/pfsinexr
 bin/pfsinhdrgen
 ${PLIST.im}bin/pfsinimgmagick
 bin/pfsinme
@@ -26,7 +25,6 @@ bin/pfsinyuv
 ${PLIST.octave}bin/pfsoctavelum
 ${PLIST.octave}bin/pfsoctavergb
 bin/pfsout
-bin/pfsoutexr
 ${PLIST.im}bin/pfsouthdrhtml
 ${PLIST.im}bin/pfsoutimgmagick
 bin/pfsoutpfm
@@ -73,7 +71,6 @@ ${PLIST.gl}man/man1/pfsglview.1
 man/man1/pfshdrcalibrate.1
 man/man1/pfsin.1
 man/man1/pfsindcraw.1
-man/man1/pfsinexr.1
 man/man1/pfsinhdrgen.1
 ${PLIST.im}man/man1/pfsinimgmagick.1
 man/man1/pfsinme.1
@@ -85,7 +82,6 @@ man/man1/pfsinyuv.1
 ${PLIST.octave}man/man1/pfsoctavelum.1
 ${PLIST.octave}man/man1/pfsoctavergb.1
 man/man1/pfsout.1
-man/man1/pfsoutexr.1
 ${PLIST.im}man/man1/pfsouthdrhtml.1
 ${PLIST.im}man/man1/pfsoutimgmagick.1
 man/man1/pfsoutpfm.1

lang/php/phpversion.mk

@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.341 2021/09/24 02:27:03 taca Exp $
+# $NetBSD: phpversion.mk,v 1.341.2.6 2021/11/23 22:50:50 tm 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
@@ -88,9 +88,9 @@ PHPVERSION_MK=	defined
 
 # Define each PHP's version.
 PHP56_VERSION=	5.6.40
-PHP73_VERSION=	7.3.31
-PHP74_VERSION=	7.4.24
-PHP80_VERSION=	8.0.11
+PHP73_VERSION=	7.3.33
+PHP74_VERSION=	7.4.26
+PHP80_VERSION=	8.0.13
 
 # Define initial release of major version.
 PHP56_RELDATE=	20140828

lang/php73/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.36 2021/09/23 14:11:48 taca Exp $
+$NetBSD: distinfo,v 1.36.2.2 2021/11/23 22:49:09 tm Exp $
 
-SHA1 (php-7.3.31.tar.xz) = ab51270c59e0b7b71d832c783118808cd318ed11
-RMD160 (php-7.3.31.tar.xz) = c6742d9b6675d1dbbc5a89eab3686f20313f5a6c
-SHA512 (php-7.3.31.tar.xz) = 63a8122233b9892453b6b92429497a7ad9761ad88063e2b95607b5d4d4c0a0e1135073bcae5a0e69a17082d2348911cbbd4807c0d20905d93324d89e5b019a05
-Size (php-7.3.31.tar.xz) = 12142912 bytes
+SHA1 (php-7.3.33.tar.xz) = d28e7e4bcfd2b4d344dde373064865fc63d7dbca
+RMD160 (php-7.3.33.tar.xz) = b35e975ea04ab1a86a95d17a4f8048d295ab1475
+SHA512 (php-7.3.33.tar.xz) = b05edb3e87775c0b2d7bd5990e47751279076e6ef2356f59dc917f4a1447d95894f596cd8de711f03278650ff74ff9f2687ed96cec69d2d669a6af563a455e25
+Size (php-7.3.33.tar.xz) = 12143820 bytes
 SHA1 (patch-configure) = 08b80528ba90c705398e8841c232382663479a3b
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335

lang/php74/distinfo

@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.28 2021/09/24 02:27:04 taca Exp $
+$NetBSD: distinfo,v 1.28.2.2 2021/11/23 22:47:04 tm Exp $
 
-SHA1 (php-7.4.24.tar.xz) = 34660781db70c891dcaab046931d38f60464d7e3
-RMD160 (php-7.4.24.tar.xz) = 67a0c7ca2067311ee363e685fc89aba1980b0778
-SHA512 (php-7.4.24.tar.xz) = 30dd0a83d6184791f4cff3edcffeb05470de8f98ddadba3c11544449bf500280ff2048a8ca8588b35d0622dcbbf16f55ea297f51d469ae137048cab2d40da9cd
-Size (php-7.4.24.tar.xz) = 10372816 bytes
+SHA1 (php-7.4.26.tar.xz) = 7057da60ba8c65e2b0c75129bb9ffff8ddd2f9d0
+RMD160 (php-7.4.26.tar.xz) = 3072fb3ed288d7c2be259df3866fb38878d0a606
+SHA512 (php-7.4.26.tar.xz) = 36cd493c9c95aabb1ee47e82cb0c20b2be99fe7ebd98743355139064590d0b9a1746d71e31dd47f164df34ebe3f8366a75f3efc149262e1391b43d83d3045c6e
+Size (php-7.4.26.tar.xz) = 10420236 bytes
 SHA1 (patch-build_libtool.m4) = 3656eb516fb14defd4b0964fe21e117c630be856
 SHA1 (patch-configure) = 5e9c9c06f6d819d5ba2832d648f41363f40f3108
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
-SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = c6702b071a1881ed35a1c1adc0e07ce53335e2e7
+SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = b0ded220ffa42b77228d66696f00212caf37b4aa
 SHA1 (patch-ext_intl_collator_collator__sort.c) = 7fdb751cabb24eb4097cfb5cf23ba217a9893530
 SHA1 (patch-ext_intl_dateformat_dateformat__attr.c) = 08a26ec534b67ed029426e4aa3bd26cb6761aead
 SHA1 (patch-ext_intl_normalizer_normalizer__normalize.c) = 10a215438db81c9f1f002f9409ebd56de6d65617

lang/php74/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp

@@ -1,8 +1,8 @@
-$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.2 2020/11/08 23:55:44 otis Exp $
+$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.2.8.1 2021/11/23 22:47:04 tm Exp $
 
 Use stdbool true/false macros.
 
---- ext/intl/breakiterator/codepointiterator_internal.cpp.orig	2020-10-27 15:01:59.000000000 +0000
+--- ext/intl/breakiterator/codepointiterator_internal.cpp.orig	2021-11-16 15:31:39.000000000 +0000
 +++ ext/intl/breakiterator/codepointiterator_internal.cpp
 @@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIt
  		return *this;
@@ -13,8 +13,8 @@ Use stdbool true/false macros.
  
  	//don't bother copying the character iterator, getText() is deprecated
  	clearCurrentCharIter();
-@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakI
- UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
+@@ -82,17 +82,17 @@ UBool CodePointBreakIterator::operator==
+ #endif
  {
  	if (typeid(*this) != typeid(that)) {
 -		return FALSE;
@@ -34,7 +34,7 @@ Use stdbool true/false macros.
  }
  
  CodePointBreakIterator* CodePointBreakIterator::clone(void) const
-@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterato
+@@ -113,7 +113,7 @@ CharacterIterator& CodePointBreakIterato
  
  UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
  {
@@ -43,7 +43,7 @@ Use stdbool true/false macros.
  }
  
  void CodePointBreakIterator::setText(const UnicodeString &text)
-@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UTe
+@@ -132,7 +132,7 @@ void CodePointBreakIterator::setText(UTe
  		return;
  	}
  
@@ -52,7 +52,7 @@ Use stdbool true/false macros.
  
  	clearCurrentCharIter();
  }
-@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIt
+@@ -284,7 +284,7 @@ CodePointBreakIterator &CodePointBreakIt
  	}
  
  	int64_t pos = utext_getNativeIndex(this->fText);

lang/php80/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2021/09/23 15:48:37 taca Exp $
+$NetBSD: distinfo,v 1.8.2.2 2021/11/23 22:50:50 tm Exp $
 
-SHA1 (php-8.0.11.tar.xz) = a69e003e68abe2a511fa7632f1cfa017f32be34d
-RMD160 (php-8.0.11.tar.xz) = 291d6e4d7e331bb43f570ef053b4fb484ff40c3c
-SHA512 (php-8.0.11.tar.xz) = 2d346959b2691ea0d5334dc9cad225b7a65ec53d6a6493f3b95c4819a0c088bec36aa1bf4ab3c8044a631bcfefb689d85463ff2259d42000e65dac30badcc59d
-Size (php-8.0.11.tar.xz) = 10804388 bytes
+SHA1 (php-8.0.13.tar.xz) = 53e7bfb527c0be4fe1ac1022b9e2895cbc256860
+RMD160 (php-8.0.13.tar.xz) = 7e5038022c46d5085725627410f887d09ce1f36a
+SHA512 (php-8.0.13.tar.xz) = cb00482b74146670c4644f4b5da63b40d9afd111e198cdf1e67bfcf4280501a657b4fbad8fd7580f4e3f537db3c8a9db5f4115d3a466392cefac9866e233fa49
+Size (php-8.0.13.tar.xz) = 10854284 bytes
 SHA1 (patch-build_libtool.m4) = e58a2bcebe9e9d7dc7255354fd9fe57878e3f8a6
 SHA1 (patch-configure) = 6c3d2537eb4d1c2ed05e8e1e411701d316c67d8b
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640

lang/python27/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.93 2020/12/07 13:14:38 nia Exp $
+# $NetBSD: Makefile,v 1.93.8.2 2021/11/02 18:42:01 tm Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python27-${PY_DISTVERSION}
-PKGREVISION=	3
+PKGREVISION=	5
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -188,6 +188,12 @@ SUBST_FILES.pkgversion=	Lib/lib2to3/pgen2/driver.py
 SUBST_FILES.pkgversion+=Lib/distutils/command/install_egg_info.py
 SUBST_VARS.pkgversion=	PKGVERSION_NOREV
 
+SUBST_CLASSES+=		urllib
+SUBST_MESSAGE.urllib=	Fixing path to urllib.cfg.
+SUBST_STAGE.urllib=	pre-configure
+SUBST_FILES.urllib=	Lib/urlparse.py
+SUBST_VARS.urllib=	PKG_SYSCONFDIR
+
 .include "options.mk"
 
 SUBST_CLASSES+=		sslbase

lang/python27/distinfo

@@ -1,15 +1,19 @@
-$NetBSD: distinfo,v 1.82 2021/06/23 18:30:24 schmonz Exp $
+$NetBSD: distinfo,v 1.82.2.2 2021/11/02 18:42:01 tm Exp $
 
 SHA1 (Python-2.7.18.tar.xz) = 678d4cf483a1c92efd347ee8e1e79326dc82810b
 RMD160 (Python-2.7.18.tar.xz) = 40a514bb05c9e631454ea8466e28f5bb229428ad
 SHA512 (Python-2.7.18.tar.xz) = a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
 Size (Python-2.7.18.tar.xz) = 12854736 bytes
+SHA1 (patch-Doc_library_cgi.rst) = ed9ac101b0857dc573e9a648694d1ee5fabe61fb
+SHA1 (patch-Doc_library_urlparse.rst) = f9714b945a2bacb4ec5360c151a42192e00f08ad
 SHA1 (patch-Include_pyerrors.h) = 0d2cd52d18cc719b895fa32ed7e11c6cb15bae54
 SHA1 (patch-Include_pyport.h) = f3e4ddbc954425a65301465410911222ca471320
 SHA1 (patch-Lib___osx__support.py) = 4389472565616b3875c699f6e3e74850d5fde712
+SHA1 (patch-Lib_cgi.py) = 9653904acfd2dbe03655a7cfa5688c450556671b
 SHA1 (patch-Lib_ctypes_____init____.py) = 31dd0546bbe29ad1b1d481edc525ba43479c06da
 SHA1 (patch-Lib_ctypes_macholib_dyld.py) = 9b7e972d4c71311742ca8b3501382182a4c9e2fe
 SHA1 (patch-Lib_ctypes_test_test__macholib.py) = 4479d315cd037f4c9138e8f5baa8eb1685932baa
+SHA1 (patch-Lib_ctypes_test_test__parameters.py) = 8f8bb50515bc7e89ab59363b10af4d5391957eb7
 SHA1 (patch-Lib_ctypes_util.py) = 6fa516c7b43f08992427a0afcbe80c17bcc070f1
 SHA1 (patch-Lib_distutils_command_build__ext.py) = ea4feba4e93dbcff07050c82a00d591bb650e934
 SHA1 (patch-Lib_distutils_command_install.py) = e6aef090b444b455fe351308d251e670329b7dc3
@@ -17,21 +21,25 @@ SHA1 (patch-Lib_distutils_command_install__egg__info.py) = ec7f9e0cd04489b1f6497
 SHA1 (patch-Lib_distutils_tests_test__build__ext.py) = 6b3c8c8d1d351836b239c049d34d132953bd4786
 SHA1 (patch-Lib_distutils_unixccompiler.py) = db16c9aca2f29730945f28247b88b18828739bbb
 SHA1 (patch-Lib_distutils_util.py) = 5bcfad96f8e490351160f1a7c1f4ece7706a33fa
-SHA1 (patch-Lib_httplib.py) = 375d80eb79209f53046c62db128d8d3f64d9e765
+SHA1 (patch-Lib_httplib.py) = b8eeaa203e2a86ece94148d192b2a7e0c078602a
 SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = 5d6dab14197f27363394ff1aeee22a8ced8026d2
 SHA1 (patch-Lib_multiprocessing_process.py) = 15699bd8ec822bf54a0631102e00e0a34f882803
 SHA1 (patch-Lib_plistlib.py) = 96ae702995d434e2d7ec0ac62e37427a90b61d13
 SHA1 (patch-Lib_sysconfig.py) = 8a7a0e5cbfec279a05945dffafea1b1131a76f0e
 SHA1 (patch-Lib_tarfile.py) = df00aa1941367c42dcbbed4b6658b724a22ddcde
-SHA1 (patch-Lib_test_test__httplib.py) = 9d37263e36110838e0b5f413ff4747deb3966dfe
+SHA1 (patch-Lib_test_multibytecodec__support.py) = a18c40e8009f1a8f63e15196d3e751d7dccf8367
+SHA1 (patch-Lib_test_test__cgi.py) = 724355e8d2195f8a4b76d7ea61133e9b14fa3a68
+SHA1 (patch-Lib_test_test__httplib.py) = f7cfa5501a63eaca539bfa53d38cf931f3a6c3ac
 SHA1 (patch-Lib_test_test__platform.py) = 3a3b8c05f9bf9adf4862b1022ce864127d36b8b0
 SHA1 (patch-Lib_test_test__unicode.py) = 1bd182bdbd880d0a847f9d8b69277a607f9f0526
 SHA1 (patch-Lib_test_test__urllib2.py) = 89baa57daf2f3282e4fc5009915dbc4910b96ef1
-SHA1 (patch-Lib_urllib2.py) = 33a85593da702447fa3ea74b4e3d36d0016f70b5
+SHA1 (patch-Lib_test_test__urlparse.py) = 257cb3bf7a0e9b5e0dcb204f675959b10953ba7b
+SHA1 (patch-Lib_urllib2.py) = 0cc0dc811bb9544496962e08b040b5c96fb9073c
+SHA1 (patch-Lib_urlparse.py) = 69db5325a19474113e72c1feeb895a25534412c4
 SHA1 (patch-Mac_Tools_pythonw.c) = 2b9a60d4b349c240471fd305be69c28e0f654cdc
 SHA1 (patch-Makefile.pre.in) = ceaf34237588b527478ce1f9163c9168382fa201
 SHA1 (patch-Modules___ctypes_callbacks.c) = 8c335edfc9d2ef47988c5bdf1c3dd8473757637b
-SHA1 (patch-Modules___ctypes_callproc.c) = adac5eb047eb58c14003ea9237d5d34e8b327b2f
+SHA1 (patch-Modules___ctypes_callproc.c) = 7b669f9c081bbc2b7fce2c827703f52b7389d592
 SHA1 (patch-Modules___ctypes_ctypes.h) = 07e9d5ecf8309a3ca4bf8382411d56dda08d7b27
 SHA1 (patch-Modules___ctypes_malloc__closure.c) = 25d470cc66d218446227c7c1bd7ade409c53b8d0
 SHA1 (patch-Modules___multiprocessing_multiprocessing.h) = 7ca8fe22ba4bdcde6d39dd50fe2e86c25994c146

lang/python27/patches/patch-Doc_library_cgi.rst

@@ -0,0 +1,29 @@
+$NetBSD: patch-Doc_library_cgi.rst,v 1.1.2.2 2021/10/13 21:04:01 tm Exp $
+
+Fix CVE-2021-23336: Add `separator` argument to parse_qs; warn with default
+Via Fedora:
+https://src.fedoraproject.org/rpms/python2.7/blob/rawhide/f/00359-CVE-2021-23336.patch
+
+--- Doc/library/cgi.rst.orig	2020-04-19 21:13:39.000000000 +0000
++++ Doc/library/cgi.rst
+@@ -285,10 +285,10 @@ These are useful if you want more contro
+ algorithms implemented in this module in other circumstances.
+ 
+ 
+-.. function:: parse(fp[, environ[, keep_blank_values[, strict_parsing]]])
++.. function:: parse(fp[, environ[, keep_blank_values[, strict_parsing[, separator]]]])
+ 
+    Parse a query in the environment or from a file (the file defaults to
+-   ``sys.stdin`` and environment defaults to ``os.environ``).  The *keep_blank_values* and *strict_parsing* parameters are
++   ``sys.stdin`` and environment defaults to ``os.environ``).  The *keep_blank_values*, *strict_parsing* and *separator* parameters are
+    passed to :func:`urlparse.parse_qs` unchanged.
+ 
+ 
+@@ -316,7 +316,6 @@ algorithms implemented in this module in
+    Note that this does not parse nested multipart parts --- use
+    :class:`FieldStorage` for that.
+ 
+-
+ .. function:: parse_header(string)
+ 
+    Parse a MIME header (such as :mailheader:`Content-Type`) into a main value and a

lang/python27/patches/patch-Doc_library_urlparse.rst

@@ -0,0 +1,51 @@
+$NetBSD: patch-Doc_library_urlparse.rst,v 1.1.2.2 2021/10/13 21:04:01 tm Exp $
+
+Fix CVE-2021-23336: Add `separator` argument to parse_qs; warn with default
+Via Fedora:
+https://src.fedoraproject.org/rpms/python2.7/blob/rawhide/f/00359-CVE-2021-23336.patch
+
+--- Doc/library/urlparse.rst.orig	2020-04-19 21:13:39.000000000 +0000
++++ Doc/library/urlparse.rst
+@@ -136,7 +136,7 @@ The :mod:`urlparse` module defines the f
+       now raise :exc:`ValueError`.
+ 
+ 
+-.. function:: parse_qs(qs[, keep_blank_values[, strict_parsing[, max_num_fields]]])
++.. function:: parse_qs(qs[, keep_blank_values[, strict_parsing[, max_num_fields[, separator]]]])
+ 
+    Parse a query string given as a string argument (data of type
+    :mimetype:`application/x-www-form-urlencoded`).  Data are returned as a
+@@ -157,6 +157,15 @@ The :mod:`urlparse` module defines the f
+    read. If set, then throws a :exc:`ValueError` if there are more than
+    *max_num_fields* fields read.
+ 
++   The optional argument *separator* is the symbol to use for separating the
++   query arguments. It is recommended to set it to ``'&'`` or ``';'``.
++   It defaults to ``'&'``; a warning is raised if this default is used.
++   This default may be changed with the following environment variable settings:
++
++   - ``PYTHON_URLLIB_QS_SEPARATOR='&'``: use only ``&`` as separator, without warning (as in Python 3.6.13+ or 3.10)
++   - ``PYTHON_URLLIB_QS_SEPARATOR=';'``: use only ``;`` as separator
++   - ``PYTHON_URLLIB_QS_SEPARATOR=legacy``: use both ``&`` and ``;`` (as in previous versions of Python)
++
+    Use the :func:`urllib.urlencode` function to convert such dictionaries into
+    query strings.
+ 
+@@ -186,6 +195,9 @@ The :mod:`urlparse` module defines the f
+    read. If set, then throws a :exc:`ValueError` if there are more than
+    *max_num_fields* fields read.
+ 
++   The optional argument *separator* is the symbol to use for separating the
++   query arguments. It works as in :py:func:`parse_qs`.
++
+    Use the :func:`urllib.urlencode` function to convert such lists of pairs into
+    query strings.
+ 
+@@ -195,6 +207,7 @@ The :mod:`urlparse` module defines the f
+    .. versionchanged:: 2.7.16
+       Added *max_num_fields* parameter.
+ 
++
+ .. function:: urlunparse(parts)
+ 
+    Construct a URL from a tuple as returned by ``urlparse()``. The *parts* argument

lang/python27/patches/patch-Lib_cgi.py

@@ -0,0 +1,128 @@
+$NetBSD: patch-Lib_cgi.py,v 1.1.2.2 2021/10/13 21:04:01 tm Exp $
+
+Fix CVE-2021-23336: Add `separator` argument to parse_qs; warn with default
+Via Fedora:
+https://src.fedoraproject.org/rpms/python2.7/blob/rawhide/f/00359-CVE-2021-23336.patch
+
+--- Lib/cgi.py.orig	2020-04-19 21:13:39.000000000 +0000
++++ Lib/cgi.py
+@@ -121,7 +121,8 @@ log = initlog           # The current lo
+ # 0 ==> unlimited input
+ maxlen = 0
+ 
+-def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0):
++def parse(fp=None, environ=os.environ, keep_blank_values=0,
++          strict_parsing=0, separator=None):
+     """Parse a query in the environment or from a file (default stdin)
+ 
+         Arguments, all optional:
+@@ -140,6 +141,8 @@ def parse(fp=None, environ=os.environ, k
+         strict_parsing: flag indicating what to do with parsing errors.
+             If false (the default), errors are silently ignored.
+             If true, errors raise a ValueError exception.
++
++        separator: str. The symbol to use for separating the query arguments.
+     """
+     if fp is None:
+         fp = sys.stdin
+@@ -171,25 +174,26 @@ def parse(fp=None, environ=os.environ, k
+         else:
+             qs = ""
+         environ['QUERY_STRING'] = qs    # XXX Shouldn't, really
+-    return urlparse.parse_qs(qs, keep_blank_values, strict_parsing)
++    return urlparse.parse_qs(qs, keep_blank_values, strict_parsing, separator=separator)
+ 
+ 
+ # parse query string function called from urlparse,
+ # this is done in order to maintain backward compatibility.
+ 
+-def parse_qs(qs, keep_blank_values=0, strict_parsing=0):
++def parse_qs(qs, keep_blank_values=0, strict_parsing=0, separator=None):
+     """Parse a query given as a string argument."""
+     warn("cgi.parse_qs is deprecated, use urlparse.parse_qs instead",
+          PendingDeprecationWarning, 2)
+-    return urlparse.parse_qs(qs, keep_blank_values, strict_parsing)
++    return urlparse.parse_qs(qs, keep_blank_values, strict_parsing,
++                             separator=separator)
+ 
+ 
+-def parse_qsl(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None):
++def parse_qsl(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None, separator=None):
+     """Parse a query given as a string argument."""
+     warn("cgi.parse_qsl is deprecated, use urlparse.parse_qsl instead",
+          PendingDeprecationWarning, 2)
+     return urlparse.parse_qsl(qs, keep_blank_values, strict_parsing,
+-                              max_num_fields)
++                              max_num_fields, separator=separator)
+ 
+ def parse_multipart(fp, pdict):
+     """Parse multipart input.
+@@ -288,7 +292,6 @@ def parse_multipart(fp, pdict):
+ 
+     return partdict
+ 
+-
+ def _parseparam(s):
+     while s[:1] == ';':
+         s = s[1:]
+@@ -395,7 +398,7 @@ class FieldStorage:
+ 
+     def __init__(self, fp=None, headers=None, outerboundary="",
+                  environ=os.environ, keep_blank_values=0, strict_parsing=0,
+-                 max_num_fields=None):
++                 max_num_fields=None, separator=None):
+         """Constructor.  Read multipart/* until last part.
+ 
+         Arguments, all optional:
+@@ -430,6 +433,7 @@ class FieldStorage:
+         self.keep_blank_values = keep_blank_values
+         self.strict_parsing = strict_parsing
+         self.max_num_fields = max_num_fields
++        self.separator = separator
+         if 'REQUEST_METHOD' in environ:
+             method = environ['REQUEST_METHOD'].upper()
+         self.qs_on_post = None
+@@ -613,7 +617,8 @@ class FieldStorage:
+         if self.qs_on_post:
+             qs += '&' + self.qs_on_post
+         query = urlparse.parse_qsl(qs, self.keep_blank_values,
+-                                   self.strict_parsing, self.max_num_fields)
++                                   self.strict_parsing, self.max_num_fields,
++                                   self.separator)
+         self.list = [MiniFieldStorage(key, value) for key, value in query]
+         self.skip_lines()
+ 
+@@ -629,7 +634,8 @@ class FieldStorage:
+             query = urlparse.parse_qsl(self.qs_on_post,
+                                        self.keep_blank_values,
+                                        self.strict_parsing,
+-                                       self.max_num_fields)
++                                       self.max_num_fields,
++                                       self.separator)
+             self.list.extend(MiniFieldStorage(key, value)
+                              for key, value in query)
+             FieldStorageClass = None
+@@ -649,7 +655,8 @@ class FieldStorage:
+             headers = rfc822.Message(self.fp)
+             part = klass(self.fp, headers, ib,
+                          environ, keep_blank_values, strict_parsing,
+-                         max_num_fields)
++                         max_num_fields,
++                         separator=self.separator)
+ 
+             if max_num_fields is not None:
+                 max_num_fields -= 1
+@@ -817,10 +824,11 @@ class FormContentDict(UserDict.UserDict)
+     form.dict == {key: [val, val, ...], ...}
+ 
+     """
+-    def __init__(self, environ=os.environ, keep_blank_values=0, strict_parsing=0):
++    def __init__(self, environ=os.environ, keep_blank_values=0, strict_parsing=0, separator=None):
+         self.dict = self.data = parse(environ=environ,
+                                       keep_blank_values=keep_blank_values,
+-                                      strict_parsing=strict_parsing)
++                                      strict_parsing=strict_parsing,
++                                      separator=separator)
+         self.query_string = environ['QUERY_STRING']
+ 
+ 

lang/python27/patches/patch-Lib_ctypes_test_test__parameters.py

@@ -0,0 +1,58 @@
+$NetBSD: patch-Lib_ctypes_test_test__parameters.py,v 1.1.2.2 2021/10/13 21:04:01 tm Exp $
+
+Fix CVE-2021-3177: Replace snprintf with Python unicode formatting in ctypes param reprs
+Via Fedora:
+https://src.fedoraproject.org/rpms/python2.7/blob/rawhide/f/00357-CVE-2021-3177.patch
+
+--- Lib/ctypes/test/test_parameters.py.orig	2020-04-19 21:13:39.000000000 +0000
++++ Lib/ctypes/test/test_parameters.py
+@@ -206,6 +206,49 @@ class SimpleTypesTestCase(unittest.TestC
+         with self.assertRaises(ZeroDivisionError):
+             WorseStruct().__setstate__({}, b'foo')
+ 
++    def test_parameter_repr(self):
++        from ctypes import (
++            c_bool,
++            c_char,
++            c_wchar,
++            c_byte,
++            c_ubyte,
++            c_short,
++            c_ushort,
++            c_int,
++            c_uint,
++            c_long,
++            c_ulong,
++            c_longlong,
++            c_ulonglong,
++            c_float,
++            c_double,
++            c_longdouble,
++            c_char_p,
++            c_wchar_p,
++            c_void_p,
++        )
++        self.assertRegexpMatches(repr(c_bool.from_param(True)), r"^<cparam '\?' at 0x[A-Fa-f0-9]+>$")
++        self.assertEqual(repr(c_char.from_param('a')), "<cparam 'c' ('a')>")
++        self.assertRegexpMatches(repr(c_wchar.from_param('a')), r"^<cparam 'u' at 0x[A-Fa-f0-9]+>$")
++        self.assertEqual(repr(c_byte.from_param(98)), "<cparam 'b' (98)>")
++        self.assertEqual(repr(c_ubyte.from_param(98)), "<cparam 'B' (98)>")
++        self.assertEqual(repr(c_short.from_param(511)), "<cparam 'h' (511)>")
++        self.assertEqual(repr(c_ushort.from_param(511)), "<cparam 'H' (511)>")
++        self.assertRegexpMatches(repr(c_int.from_param(20000)), r"^<cparam '[li]' \(20000\)>$")
++        self.assertRegexpMatches(repr(c_uint.from_param(20000)), r"^<cparam '[LI]' \(20000\)>$")
++        self.assertRegexpMatches(repr(c_long.from_param(20000)), r"^<cparam '[li]' \(20000\)>$")
++        self.assertRegexpMatches(repr(c_ulong.from_param(20000)), r"^<cparam '[LI]' \(20000\)>$")
++        self.assertRegexpMatches(repr(c_longlong.from_param(20000)), r"^<cparam '[liq]' \(20000\)>$")
++        self.assertRegexpMatches(repr(c_ulonglong.from_param(20000)), r"^<cparam '[LIQ]' \(20000\)>$")
++        self.assertEqual(repr(c_float.from_param(1.5)), "<cparam 'f' (1.5)>")
++        self.assertEqual(repr(c_double.from_param(1.5)), "<cparam 'd' (1.5)>")
++        self.assertEqual(repr(c_double.from_param(1e300)), "<cparam 'd' (1e+300)>")
++        self.assertRegexpMatches(repr(c_longdouble.from_param(1.5)), r"^<cparam ('d' \(1.5\)|'g' at 0x[A-Fa-f0-9]+)>$")
++        self.assertRegexpMatches(repr(c_char_p.from_param(b'hihi')), "^<cparam 'z' \(0x[A-Fa-f0-9]+\)>$")
++        self.assertRegexpMatches(repr(c_wchar_p.from_param('hihi')), "^<cparam 'Z' \(0x[A-Fa-f0-9]+\)>$")
++        self.assertRegexpMatches(repr(c_void_p.from_param(0x12)), r"^<cparam 'P' \(0x0*12\)>$")
++
+ ################################################################
+ 
+ if __name__ == '__main__':

lang/python27/patches/patch-Lib_httplib.py

@@ -1,10 +1,14 @@
-$NetBSD: patch-Lib_httplib.py,v 1.3 2020/09/27 14:57:22 leot Exp $
+$NetBSD: patch-Lib_httplib.py,v 1.3.8.1 2021/10/13 21:04:01 tm Exp $
 
 bpo-39603 (CVE-2020-26116): header injection via HTTP method
 
-taken from:
+Taken from:
 https://gitweb.gentoo.org/fork/cpython.git/commit/?h=gentoo-2.7-vanilla&id=138e2caeb4827ccfd1eaff2cf63afb79dfeeb3c4
 
+Fix CVE-2021-3737: http client infinite line reading (DoS) after a HTTP 100 Continue
+Via Fedora:
+https://src.fedoraproject.org/rpms/python2.7/blob/rawhide/f/00368-CVE-2021-3737.patch
+
 --- Lib/httplib.py.orig	2020-04-19 21:13:39.000000000 +0000
 +++ Lib/httplib.py
 @@ -257,6 +257,10 @@ _contains_disallowed_url_pchar_re = re.c
@@ -18,7 +22,53 @@ https://gitweb.gentoo.org/fork/cpython.git/commit/?h=gentoo-2.7-vanilla&id=138e2
  # We always set the Content-Length header for these methods because some
  # servers will otherwise respond with a 411
  _METHODS_EXPECTING_BODY = {'PATCH', 'POST', 'PUT'}
-@@ -935,6 +939,8 @@ class HTTPConnection:
+@@ -361,6 +365,25 @@ class HTTPMessage(mimetools.Message):
+                 # It's not a header line; skip it and try the next line.
+                 self.status = 'Non-header line where header expected'
+ 
++
++def _read_headers(fp):
++    """Reads potential header lines into a list from a file pointer.
++    Length of line is limited by _MAXLINE, and number of
++    headers is limited by _MAXHEADERS.
++    """
++    headers = []
++    while True:
++        line = fp.readline(_MAXLINE + 1)
++        if len(line) > _MAXLINE:
++            raise LineTooLong("header line")
++        headers.append(line)
++        if len(headers) > _MAXHEADERS:
++            raise HTTPException("got more than %d headers" % _MAXHEADERS)
++        if line in (b'\r\n', b'\n', b''):
++            break
++    return headers
++
++
+ class HTTPResponse:
+ 
+     # strict: If true, raise BadStatusLine if the status line can't be
+@@ -449,15 +472,10 @@ class HTTPResponse:
+             if status != CONTINUE:
+                 break
+             # skip the header from the 100 response
+-            while True:
+-                skip = self.fp.readline(_MAXLINE + 1)
+-                if len(skip) > _MAXLINE:
+-                    raise LineTooLong("header line")
+-                skip = skip.strip()
+-                if not skip:
+-                    break
+-                if self.debuglevel > 0:
+-                    print "header:", skip
++            skipped_headers = _read_headers(self.fp)
++            if self.debuglevel > 0:
++                print("headers:", skipped_headers)
++            del skipped_headers
+ 
+         self.status = status
+         self.reason = reason.strip()
+@@ -935,6 +953,8 @@ class HTTPConnection:
          else:
              raise CannotSendRequest()
  
@@ -27,7 +77,7 @@ https://gitweb.gentoo.org/fork/cpython.git/commit/?h=gentoo-2.7-vanilla&id=138e2
          # Save the method for use later in the response phase
          self._method = method
  
-@@ -1020,6 +1026,17 @@ class HTTPConnection:
+@@ -1020,6 +1040,17 @@ class HTTPConnection:
          # On Python 2, request is already encoded (default)
          return request
  

lang/python27/patches/patch-Lib_test_multibytecodec__support.py

@@ -0,0 +1,46 @@
+$NetBSD: patch-Lib_test_multibytecodec__support.py,v 1.1.2.2 2021/10/13 21:04:01 tm Exp $
+
+Fix CVE-2020-27619: No longer call eval() on content received via HTTP in the CJK codec tests
+Via Fedora:
+https://src.fedoraproject.org/rpms/python2.7/blob/rawhide/f/00355-CVE-2020-27619.patch
+
+--- Lib/test/multibytecodec_support.py.orig	2020-04-19 21:13:39.000000000 +0000
++++ Lib/test/multibytecodec_support.py
+@@ -279,30 +279,22 @@ class TestBase_Mapping(unittest.TestCase
+             self._test_mapping_file_plain()
+ 
+     def _test_mapping_file_plain(self):
+-        _unichr = lambda c: eval("u'\\U%08x'" % int(c, 16))
+-        unichrs = lambda s: u''.join(_unichr(c) for c in s.split('+'))
++        def unichrs(s):
++            return ''.join(unichr(int(x, 16)) for x in s.split('+'))
+         urt_wa = {}
+ 
+         with self.open_mapping_file() as f:
+             for line in f:
+                 if not line:
+                     break
+-                data = line.split('#')[0].strip().split()
++                data = line.split('#')[0].split()
+                 if len(data) != 2:
+                     continue
+ 
+-                csetval = eval(data[0])
+-                if csetval <= 0x7F:
+-                    csetch = chr(csetval & 0xff)
+-                elif csetval >= 0x1000000:
+-                    csetch = chr(csetval >> 24) + chr((csetval >> 16) & 0xff) + \
+-                             chr((csetval >> 8) & 0xff) + chr(csetval & 0xff)
+-                elif csetval >= 0x10000:
+-                    csetch = chr(csetval >> 16) + \
+-                             chr((csetval >> 8) & 0xff) + chr(csetval & 0xff)
+-                elif csetval >= 0x100:
+-                    csetch = chr(csetval >> 8) + chr(csetval & 0xff)
+-                else:
++                if data[0][:2] != '0x':
++                    self.fail("Invalid line: {!r}".format(line))
++                csetch = bytes.fromhex(data[0][2:])
++                if len(csetch) == 1 and 0x80 <= csetch[0]:
+                     continue
+ 
+                 unich = unichrs(data[1])

lang/python27/patches/patch-Lib_test_test__cgi.py

@@ -0,0 +1,91 @@
+$NetBSD: patch-Lib_test_test__cgi.py,v 1.1.2.2 2021/10/13 21:04:01 tm Exp $
+
+Fix CVE-2021-23336: Add `separator` argument to parse_qs; warn with default
+Via Fedora:
+https://src.fedoraproject.org/rpms/python2.7/blob/rawhide/f/00359-CVE-2021-23336.patch
+
+--- Lib/test/test_cgi.py.orig	2020-04-19 21:13:39.000000000 +0000
++++ Lib/test/test_cgi.py
+@@ -61,12 +61,9 @@ parse_strict_test_cases = [
+     ("", ValueError("bad query field: ''")),
+     ("&", ValueError("bad query field: ''")),
+     ("&&", ValueError("bad query field: ''")),
+-    (";", ValueError("bad query field: ''")),
+-    (";&;", ValueError("bad query field: ''")),
+     # Should the next few really be valid?
+     ("=", {}),
+     ("=&=", {}),
+-    ("=;=", {}),
+     # This rest seem to make sense
+     ("=a", {'': ['a']}),
+     ("&=a", ValueError("bad query field: ''")),
+@@ -81,8 +78,6 @@ parse_strict_test_cases = [
+     ("a=a+b&b=b+c", {'a': ['a b'], 'b': ['b c']}),
+     ("a=a+b&a=b+a", {'a': ['a b', 'b a']}),
+     ("x=1&y=2.0&z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}),
+-    ("x=1;y=2.0&z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}),
+-    ("x=1;y=2.0;z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}),
+     ("Hbc5161168c542333633315dee1182227:key_store_seqid=400006&cuyer=r&view=bustomer&order_id=0bb2e248638833d48cb7fed300000f1b&expire=964546263&lobale=en-US&kid=130003.300038&ss=env",
+      {'Hbc5161168c542333633315dee1182227:key_store_seqid': ['400006'],
+       'cuyer': ['r'],
+@@ -143,6 +138,60 @@ class CgiTests(unittest.TestCase):
+             if isinstance(expect, dict):
+                 # test dict interface
+                 self.assertEqual(len(expect), len(fcd))
++                self.assertItemsEqual(expect.keys(), fcd.keys())
++                self.assertItemsEqual(expect.values(), fcd.values())
++                self.assertItemsEqual(expect.items(), fcd.items())
++                self.assertEqual(fcd.get("nonexistent field", "default"), "default")
++                self.assertEqual(len(sd), len(fs))
++                self.assertItemsEqual(sd.keys(), fs.keys())
++                self.assertEqual(fs.getvalue("nonexistent field", "default"), "default")
++                # test individual fields
++                for key in expect.keys():
++                    expect_val = expect[key]
++                    self.assertTrue(fcd.has_key(key))
++                    self.assertItemsEqual(fcd[key], expect[key])
++                    self.assertEqual(fcd.get(key, "default"), fcd[key])
++                    self.assertTrue(fs.has_key(key))
++                    if len(expect_val) > 1:
++                        single_value = 0
++                    else:
++                        single_value = 1
++                    try:
++                        val = sd[key]
++                    except IndexError:
++                        self.assertFalse(single_value)
++                        self.assertEqual(fs.getvalue(key), expect_val)
++                    else:
++                        self.assertTrue(single_value)
++                        self.assertEqual(val, expect_val[0])
++                        self.assertEqual(fs.getvalue(key), expect_val[0])
++                    self.assertItemsEqual(sd.getlist(key), expect_val)
++                    if single_value:
++                        self.assertItemsEqual(sd.values(),
++                                                first_elts(expect.values()))
++                        self.assertItemsEqual(sd.items(),
++                                                first_second_elts(expect.items()))
++
++    def test_separator(self):
++        parse_semicolon = [
++            ("x=1;y=2.0", {'x': ['1'], 'y': ['2.0']}),
++            ("x=1;y=2.0;z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}),
++            (";", ValueError("bad query field: ''")),
++            (";;", ValueError("bad query field: ''")),
++            ("=;a", ValueError("bad query field: 'a'")),
++            (";b=a", ValueError("bad query field: ''")),
++            ("b;=a", ValueError("bad query field: 'b'")),
++            ("a=a+b;b=b+c", {'a': ['a b'], 'b': ['b c']}),
++            ("a=a+b;a=b+a", {'a': ['a b', 'b a']}),
++        ]
++        for orig, expect in parse_semicolon:
++            env = {'QUERY_STRING': orig}
++            fcd = cgi.FormContentDict(env, separator=';')
++            sd = cgi.SvFormContentDict(env, separator=';')
++            fs = cgi.FieldStorage(environ=env, separator=';')
++            if isinstance(expect, dict):
++                # test dict interface
++                self.assertEqual(len(expect), len(fcd))
+                 self.assertItemsEqual(expect.keys(), fcd.keys())
+                 self.assertItemsEqual(expect.values(), fcd.values())
+                 self.assertItemsEqual(expect.items(), fcd.items())

lang/python27/patches/patch-Lib_test_test__httplib.py

@@ -1,10 +1,14 @@
-$NetBSD: patch-Lib_test_test__httplib.py,v 1.3 2020/09/27 14:57:22 leot Exp $
+$NetBSD: patch-Lib_test_test__httplib.py,v 1.3.8.1 2021/10/13 21:04:01 tm Exp $
 
 bpo-39603 (CVE-2020-26116): header injection via HTTP method
 
-taken from:
+Taken from:
 https://gitweb.gentoo.org/fork/cpython.git/commit/?h=gentoo-2.7-vanilla&id=138e2caeb4827ccfd1eaff2cf63afb79dfeeb3c4
 
+Fix CVE-2021-3737: http client infinite line reading (DoS) after a HTTP 100 Continue
+Via Fedora:
+https://src.fedoraproject.org/rpms/python2.7/blob/rawhide/f/00368-CVE-2021-3737.patch
+
 --- Lib/test/test_httplib.py.orig	2020-04-19 21:13:39.000000000 +0000
 +++ Lib/test/test_httplib.py
 @@ -384,6 +384,26 @@ class HeaderTests(TestCase):
@@ -34,3 +38,18 @@ https://gitweb.gentoo.org/fork/cpython.git/commit/?h=gentoo-2.7-vanilla&id=138e2
  
  class BasicTest(TestCase):
      def test_status_lines(self):
+@@ -655,6 +675,14 @@ class BasicTest(TestCase):
+         resp = httplib.HTTPResponse(FakeSocket(body))
+         self.assertRaises(httplib.LineTooLong, resp.begin)
+ 
++    def test_overflowing_header_limit_after_100(self):
++        body = (
++            'HTTP/1.1 100 OK\r\n'
++            'r\n' * 32768
++        )
++        resp = httplib.HTTPResponse(FakeSocket(body))
++        self.assertRaises(httplib.HTTPException, resp.begin)
++
+     def test_overflowing_chunked_line(self):
+         body = (
+             'HTTP/1.1 200 OK\r\n'

lang/python27/patches/patch-Lib_test_test__urlparse.py

@@ -0,0 +1,265 @@
+$NetBSD: patch-Lib_test_test__urlparse.py,v 1.1.2.2 2021/10/13 21:04:01 tm Exp $
+
+Fix CVE-2021-23336: Add `separator` argument to parse_qs; warn with default
+Via Fedora:
+https://src.fedoraproject.org/rpms/python2.7/blob/rawhide/f/00359-CVE-2021-23336.patch
+
+--- Lib/test/test_urlparse.py.orig	2020-04-19 21:13:39.000000000 +0000
++++ Lib/test/test_urlparse.py
+@@ -3,6 +3,12 @@ import sys
+ import unicodedata
+ import unittest
+ import urlparse
++from test.support import EnvironmentVarGuard
++from warnings import catch_warnings, filterwarnings
++import tempfile
++import contextlib
++import os.path
++import shutil
+ 
+ RFC1808_BASE = "http://a/b/c/d;p?q#f"
+ RFC2396_BASE = "http://a/b/c/d;p?q"
+@@ -24,16 +30,29 @@ parse_qsl_test_cases = [
+     ("&a=b", [('a', 'b')]),
+     ("a=a+b&b=b+c", [('a', 'a b'), ('b', 'b c')]),
+     ("a=1&a=2", [('a', '1'), ('a', '2')]),
++]
++
++parse_qsl_test_cases_semicolon = [
+     (";", []),
+     (";;", []),
+     (";a=b", [('a', 'b')]),
+     ("a=a+b;b=b+c", [('a', 'a b'), ('b', 'b c')]),
+     ("a=1;a=2", [('a', '1'), ('a', '2')]),
+-    (b";", []),
+-    (b";;", []),
+-    (b";a=b", [(b'a', b'b')]),
+-    (b"a=a+b;b=b+c", [(b'a', b'a b'), (b'b', b'b c')]),
+-    (b"a=1;a=2", [(b'a', b'1'), (b'a', b'2')]),
++]
++
++parse_qsl_test_cases_legacy = [
++    ("a=1;a=2&a=3", [('a', '1'), ('a', '2'), ('a', '3')]),
++    ("a=1;b=2&c=3", [('a', '1'), ('b', '2'), ('c', '3')]),
++    ("a=1&b=2&c=3;", [('a', '1'), ('b', '2'), ('c', '3')]),
++]
++
++parse_qsl_test_cases_warn = [
++    (";a=b", [(';a', 'b')]),
++    ("a=a+b;b=b+c", [('a', 'a b;b=b c')]),
++    (b";a=b", [(b';a', b'b')]),
++    (b"a=a+b;b=b+c", [(b'a', b'a b;b=b c')]),
++    ("a=1;a=2&a=3", [('a', '1;a=2'), ('a', '3')]),
++    (b"a=1;a=2&a=3", [(b'a', b'1;a=2'), (b'a', b'3')]),
+ ]
+ 
+ parse_qs_test_cases = [
+@@ -57,6 +76,9 @@ parse_qs_test_cases = [
+     (b"&a=b", {b'a': [b'b']}),
+     (b"a=a+b&b=b+c", {b'a': [b'a b'], b'b': [b'b c']}),
+     (b"a=1&a=2", {b'a': [b'1', b'2']}),
++]
++
++parse_qs_test_cases_semicolon = [
+     (";", {}),
+     (";;", {}),
+     (";a=b", {'a': ['b']}),
+@@ -69,6 +91,24 @@ parse_qs_test_cases = [
+     (b"a=1;a=2", {b'a': [b'1', b'2']}),
+ ]
+ 
++parse_qs_test_cases_legacy = [
++    ("a=1;a=2&a=3", {'a': ['1', '2', '3']}),
++    ("a=1;b=2&c=3", {'a': ['1'], 'b': ['2'], 'c': ['3']}),
++    ("a=1&b=2&c=3;", {'a': ['1'], 'b': ['2'], 'c': ['3']}),
++    (b"a=1;a=2&a=3", {b'a': [b'1', b'2', b'3']}),
++    (b"a=1;b=2&c=3", {b'a': [b'1'], b'b': [b'2'], b'c': [b'3']}),
++    (b"a=1&b=2&c=3;", {b'a': [b'1'], b'b': [b'2'], b'c': [b'3']}),
++]
++
++parse_qs_test_cases_warn = [
++    (";a=b", {';a': ['b']}),
++    ("a=a+b;b=b+c", {'a': ['a b;b=b c']}),
++    (b";a=b", {b';a': [b'b']}),
++    (b"a=a+b;b=b+c", {b'a':[ b'a b;b=b c']}),
++    ("a=1;a=2&a=3", {'a': ['1;a=2', '3']}),
++    (b"a=1;a=2&a=3", {b'a': [b'1;a=2', b'3']}),
++]
++
+ class UrlParseTestCase(unittest.TestCase):
+ 
+     def checkRoundtrips(self, url, parsed, split):
+@@ -141,6 +181,40 @@ class UrlParseTestCase(unittest.TestCase
+             self.assertEqual(result, expect_without_blanks,
+                     "Error parsing %r" % orig)
+ 
++    def test_qs_default_warn(self):
++        for orig, expect in parse_qs_test_cases_warn:
++            with catch_warnings(record=True) as w:
++                filterwarnings(action='always',
++                                        category=urlparse._QueryStringSeparatorWarning)
++                result = urlparse.parse_qs(orig, keep_blank_values=True)
++                self.assertEqual(result, expect, "Error parsing %r" % orig)
++            self.assertEqual(len(w), 1)
++            self.assertEqual(w[0].category, urlparse._QueryStringSeparatorWarning)
++
++    def test_qsl_default_warn(self):
++        for orig, expect in parse_qsl_test_cases_warn:
++            with catch_warnings(record=True) as w:
++                filterwarnings(action='always',
++                               category=urlparse._QueryStringSeparatorWarning)
++                result = urlparse.parse_qsl(orig, keep_blank_values=True)
++                self.assertEqual(result, expect, "Error parsing %r" % orig)
++            self.assertEqual(len(w), 1)
++            self.assertEqual(w[0].category, urlparse._QueryStringSeparatorWarning)
++
++    def test_default_qs_no_warnings(self):
++        for orig, expect in parse_qs_test_cases:
++            with catch_warnings(record=True) as w:
++                result = urlparse.parse_qs(orig, keep_blank_values=True)
++                self.assertEqual(result, expect, "Error parsing %r" % orig)
++            self.assertEqual(len(w), 0)
++
++    def test_default_qsl_no_warnings(self):
++        for orig, expect in parse_qsl_test_cases:
++            with catch_warnings(record=True) as w:
++                result = urlparse.parse_qsl(orig, keep_blank_values=True)
++                self.assertEqual(result, expect, "Error parsing %r" % orig)
++            self.assertEqual(len(w), 0)
++
+     def test_roundtrips(self):
+         testcases = [
+             ('file:///tmp/junk.txt',
+@@ -626,6 +700,132 @@ class UrlParseTestCase(unittest.TestCase
+         self.assertEqual(urlparse.urlparse("http://www.python.org:80"),
+                 ('http','www.python.org:80','','','',''))
+ 
++    def test_parse_qs_separator_bytes(self):
++        expected = {b'a': [b'1'], b'b': [b'2']}
++
++        result = urlparse.parse_qs(b'a=1;b=2', separator=b';')
++        self.assertEqual(result, expected)
++        result = urlparse.parse_qs(b'a=1;b=2', separator=';')
++        self.assertEqual(result, expected)
++        result = urlparse.parse_qs('a=1;b=2', separator=';')
++        self.assertEqual(result, {'a': ['1'], 'b': ['2']})
++
++    @contextlib.contextmanager
++    def _qsl_sep_config(self, sep):
++        """Context for the given parse_qsl default separator configured in config file"""
++        old_filename = urlparse._QS_SEPARATOR_CONFIG_FILENAME
++        urlparse._default_qs_separator = None
++        try:
++            tmpdirname = tempfile.mkdtemp()
++            filename = os.path.join(tmpdirname, 'conf.cfg')
++            with open(filename, 'w') as file:
++                file.write('[parse_qs]\n')
++                file.write('PYTHON_URLLIB_QS_SEPARATOR = {}'.format(sep))
++            urlparse._QS_SEPARATOR_CONFIG_FILENAME = filename
++            yield
++        finally:
++            urlparse._QS_SEPARATOR_CONFIG_FILENAME = old_filename
++            urlparse._default_qs_separator = None
++            shutil.rmtree(tmpdirname)
++
++    def test_parse_qs_separator_semicolon(self):
++        for orig, expect in parse_qs_test_cases_semicolon:
++            result = urlparse.parse_qs(orig, separator=';')
++            self.assertEqual(result, expect, "Error parsing %r" % orig)
++            with EnvironmentVarGuard() as environ, catch_warnings(record=True) as w:
++                environ['PYTHON_URLLIB_QS_SEPARATOR'] = ';'
++                result = urlparse.parse_qs(orig)
++            self.assertEqual(result, expect, "Error parsing %r" % orig)
++            self.assertEqual(len(w), 0)
++            with self._qsl_sep_config(';'), catch_warnings(record=True) as w:
++                result = urlparse.parse_qs(orig)
++            self.assertEqual(result, expect, "Error parsing %r" % orig)
++            self.assertEqual(len(w), 0)
++
++    def test_parse_qsl_separator_semicolon(self):
++        for orig, expect in parse_qsl_test_cases_semicolon:
++            result = urlparse.parse_qsl(orig, separator=';')
++            self.assertEqual(result, expect, "Error parsing %r" % orig)
++            with EnvironmentVarGuard() as environ, catch_warnings(record=True) as w:
++                environ['PYTHON_URLLIB_QS_SEPARATOR'] = ';'
++                result = urlparse.parse_qsl(orig)
++            self.assertEqual(result, expect, "Error parsing %r" % orig)
++            self.assertEqual(len(w), 0)
++            with self._qsl_sep_config(';'), catch_warnings(record=True) as w:
++                result = urlparse.parse_qsl(orig)
++            self.assertEqual(result, expect, "Error parsing %r" % orig)
++            self.assertEqual(len(w), 0)
++
++    def test_parse_qs_separator_legacy(self):
++        for orig, expect in parse_qs_test_cases_legacy:
++            with EnvironmentVarGuard() as environ, catch_warnings(record=True) as w:
++                environ['PYTHON_URLLIB_QS_SEPARATOR'] = 'legacy'
++                result = urlparse.parse_qs(orig)
++            self.assertEqual(result, expect, "Error parsing %r" % orig)
++            self.assertEqual(len(w), 0)
++            with self._qsl_sep_config('legacy'), catch_warnings(record=True) as w:
++                result = urlparse.parse_qs(orig)
++            self.assertEqual(result, expect, "Error parsing %r" % orig)
++            self.assertEqual(len(w), 0)
++
++    def test_parse_qsl_separator_legacy(self):
++        for orig, expect in parse_qsl_test_cases_legacy:
++            with EnvironmentVarGuard() as environ, catch_warnings(record=True) as w:
++                environ['PYTHON_URLLIB_QS_SEPARATOR'] = 'legacy'
++                result = urlparse.parse_qsl(orig)
++            self.assertEqual(result, expect, "Error parsing %r" % orig)
++            self.assertEqual(len(w), 0)
++            with self._qsl_sep_config('legacy'), catch_warnings(record=True) as w:
++                result = urlparse.parse_qsl(orig)
++            self.assertEqual(result, expect, "Error parsing %r" % orig)
++            self.assertEqual(len(w), 0)
++
++    def test_parse_qs_separator_bad_value_env_or_config(self):
++        for bad_sep in '', 'abc', 'safe', '&;', 'SEP':
++            with EnvironmentVarGuard() as environ, catch_warnings(record=True) as w:
++                environ['PYTHON_URLLIB_QS_SEPARATOR'] = bad_sep
++                with self.assertRaises(ValueError):
++                    urlparse.parse_qsl('a=1;b=2')
++            with self._qsl_sep_config('bad_sep'), catch_warnings(record=True) as w:
++                with self.assertRaises(ValueError):
++                    urlparse.parse_qsl('a=1;b=2')
++
++    def test_parse_qs_separator_bad_value_arg(self):
++        for bad_sep in True, {}, '':
++            with self.assertRaises(ValueError):
++                urlparse.parse_qsl('a=1;b=2', separator=bad_sep)
++
++    def test_parse_qs_separator_num_fields(self):
++        for qs, sep in (
++            ('a&b&c', '&'),
++            ('a;b;c', ';'),
++            ('a&b;c', 'legacy'),
++        ):
++            with EnvironmentVarGuard() as environ, catch_warnings(record=True) as w:
++                if sep != 'legacy':
++                    with self.assertRaises(ValueError):
++                        urlparse.parse_qsl(qs, separator=sep, max_num_fields=2)
++                if sep:
++                    environ['PYTHON_URLLIB_QS_SEPARATOR'] = sep
++                with self.assertRaises(ValueError):
++                    urlparse.parse_qsl(qs, max_num_fields=2)
++
++    def test_parse_qs_separator_priority(self):
++        # env variable trumps config file
++        with self._qsl_sep_config('~'), EnvironmentVarGuard() as environ:
++            environ['PYTHON_URLLIB_QS_SEPARATOR'] = '!'
++            result = urlparse.parse_qs('a=1!b=2~c=3')
++            self.assertEqual(result, {'a': ['1'], 'b': ['2~c=3']})
++        # argument trumps config file
++        with self._qsl_sep_config('~'):
++            result = urlparse.parse_qs('a=1$b=2~c=3', separator='$')
++            self.assertEqual(result, {'a': ['1'], 'b': ['2~c=3']})
++        # argument trumps env variable
++        with EnvironmentVarGuard() as environ:
++            environ['PYTHON_URLLIB_QS_SEPARATOR'] = '~'
++            result = urlparse.parse_qs('a=1$b=2~c=3', separator='$')
++            self.assertEqual(result, {'a': ['1'], 'b': ['2~c=3']})
++
+     def test_urlsplit_normalization(self):
+         # Certain characters should never occur in the netloc,
+         # including under normalization.

lang/python27/patches/patch-Lib_urllib2.py

@@ -1,10 +1,15 @@
-$NetBSD: patch-Lib_urllib2.py,v 1.2 2020/09/20 12:10:27 mgorny Exp $
+$NetBSD: patch-Lib_urllib2.py,v 1.2.10.1 2021/10/13 21:04:01 tm Exp $
 
 bpo-39503 (CVE-2020-8492): ReDoS on AbstractBasicAuthHandler
 
-taken from:
+Taken from:
 https://gitweb.gentoo.org/fork/cpython.git/commit/?h=gentoo-2.7-vanilla&id=2273e65e11dd0234f2f51ebaef61fc6e848d4059
 
+bpo-43075 (CVE-2021-3733): Fix ReDoS in request
+
+Taken from:
+https://github.com/python/cpython/pull/24391/
+
 --- Lib/urllib2.py.orig	2020-04-19 21:13:39.000000000 +0000
 +++ Lib/urllib2.py
 @@ -856,8 +856,15 @@ class AbstractBasicAuthHandler:
@@ -15,7 +20,7 @@ https://gitweb.gentoo.org/fork/cpython.git/commit/?h=gentoo-2.7-vanilla&id=2273e
 -                    'realm=(["\']?)([^"\']*)\\2', re.I)
 +    rx = re.compile('(?:^|,)'   # start of the string or ','
 +                    '[ \t]*'    # optional whitespaces
-+                    '([^ \t]+)' # scheme like "Basic"
++                    '([^ \t,]+)' # scheme like "Basic"
 +                    '[ \t]+'    # mandatory whitespaces
 +                    # realm=xxx
 +                    # realm='xxx'

lang/python27/patches/patch-Lib_urlparse.py

@@ -0,0 +1,127 @@
+$NetBSD: patch-Lib_urlparse.py,v 1.1.2.3 2021/11/02 18:42:01 tm Exp $
+
+Fix CVE-2021-23336: Add `separator` argument to parse_qs; warn with default
+Via Fedora:
+https://src.fedoraproject.org/rpms/python2.7/blob/rawhide/f/00359-CVE-2021-23336.patch
+
+--- Lib/urlparse.py.orig	2020-04-19 21:13:39.000000000 +0000
++++ Lib/urlparse.py
+@@ -29,6 +29,7 @@ test_urlparse.py provides a good indicat
+ """
+ 
+ import re
++import os
+ 
+ __all__ = ["urlparse", "urlunparse", "urljoin", "urldefrag",
+            "urlsplit", "urlunsplit", "parse_qs", "parse_qsl"]
+@@ -382,7 +383,8 @@ def unquote(s):
+             append(item)
+     return ''.join(res)
+ 
+-def parse_qs(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None):
++def parse_qs(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None,
++             separator=None):
+     """Parse a query given as a string argument.
+ 
+         Arguments:
+@@ -405,14 +407,23 @@ def parse_qs(qs, keep_blank_values=0, st
+     """
+     dict = {}
+     for name, value in parse_qsl(qs, keep_blank_values, strict_parsing,
+-                                 max_num_fields):
++                                 max_num_fields, separator):
+         if name in dict:
+             dict[name].append(value)
+         else:
+             dict[name] = [value]
+     return dict
+ 
+-def parse_qsl(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None):
++class _QueryStringSeparatorWarning(RuntimeWarning):
++    """Warning for using default `separator` in parse_qs or parse_qsl"""
++
++# The default "separator" for parse_qsl can be specified in a config file.
++# It's cached after first read.
++_QS_SEPARATOR_CONFIG_FILENAME = '@PKG_SYSCONFDIR@/python/urllib.cfg'
++_default_qs_separator = None
++
++def parse_qsl(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None,
++              separator=None):
+     """Parse a query given as a string argument.
+ 
+     Arguments:
+@@ -434,15 +445,72 @@ def parse_qsl(qs, keep_blank_values=0, s
+ 
+     Returns a list, as G-d intended.
+     """
++
++    if (not separator or (not isinstance(separator, (str, bytes)))) and separator is not None:
++        raise ValueError("Separator must be of type string or bytes.")
++
++    # Used when both "&" and ";" act as separators. (Need a non-string value.)
++    _legacy = object()
++
++    if separator is None:
++        global _default_qs_separator
++        separator = _default_qs_separator
++        envvar_name = 'PYTHON_URLLIB_QS_SEPARATOR'
++        if separator is None:
++            # Set default separator from environment variable
++            separator = os.environ.get(envvar_name)
++            config_source = 'environment variable'
++        if separator is None:
++            # Set default separator from the configuration file
++            try:
++                file = open(_QS_SEPARATOR_CONFIG_FILENAME)
++            except EnvironmentError:
++                pass
++            else:
++                with file:
++                    import ConfigParser
++                    config = ConfigParser.ConfigParser()
++                    config.readfp(file)
++                    separator = config.get('parse_qs', envvar_name)
++                    _default_qs_separator = separator
++                config_source = _QS_SEPARATOR_CONFIG_FILENAME
++        if separator is None:
++            # The default is '&', but warn if not specified explicitly
++            if ';' in qs:
++                from warnings import warn
++                warn("The default separator of urlparse.parse_qsl and "
++                    + "parse_qs was changed to '&' to avoid a web cache "
++                    + "poisoning issue (CVE-2021-23336). "
++                    + "By default, semicolons no longer act as query field "
++                    + "separators. "
++                    + "See https://access.redhat.com/articles/5860431 for "
++                    + "more details.",
++                    _QueryStringSeparatorWarning, stacklevel=2)
++            separator = '&'
++        elif separator == 'legacy':
++            separator = _legacy
++        elif len(separator) != 1:
++            raise ValueError(
++                '{} (from {}) must contain '.format(envvar_name, config_source)
++                + '1 character, or "legacy". See '
++                + 'https://access.redhat.com/articles/5860431 for more details.'
++            )
++
+     # If max_num_fields is defined then check that the number of fields
+     # is less than max_num_fields. This prevents a memory exhaustion DOS
+     # attack via post bodies with many fields.
+     if max_num_fields is not None:
+-        num_fields = 1 + qs.count('&') + qs.count(';')
++        if separator is _legacy:
++            num_fields = 1 + qs.count('&') + qs.count(';')
++        else:
++            num_fields = 1 + qs.count(separator)
+         if max_num_fields < num_fields:
+             raise ValueError('Max number of fields exceeded')
+ 
+-    pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
++    if separator is _legacy:
++        pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
++    else:
++        pairs = [s1 for s1 in qs.split(separator)]
+     r = []
+     for name_value in pairs:
+         if not name_value and not strict_parsing:

lang/python27/patches/patch-Modules___ctypes_callproc.c

@@ -1,8 +1,12 @@
-$NetBSD: patch-Modules___ctypes_callproc.c,v 1.1 2021/06/23 18:30:24 schmonz Exp $
+$NetBSD: patch-Modules___ctypes_callproc.c,v 1.1.2.1 2021/10/13 21:04:01 tm Exp $
 
 macOS arm64 support, via MacPorts.
 
---- Modules/_ctypes/callproc.c.orig	2021-06-22 19:20:28.000000000 +0000
+Fix CVE-2021-3177: Replace snprintf with Python unicode formatting in ctypes param reprs
+Via Fedora:
+https://src.fedoraproject.org/rpms/python2.7/blob/rawhide/f/00357-CVE-2021-3177.patch
+
+--- Modules/_ctypes/callproc.c.orig	2020-04-19 21:13:39.000000000 +0000
 +++ Modules/_ctypes/callproc.c
 @@ -74,6 +74,10 @@
  #include <malloc.h>
@@ -15,7 +19,112 @@ macOS arm64 support, via MacPorts.
  #include <ffi.h>
  #include "ctypes.h"
  #ifdef HAVE_ALLOCA_H
-@@ -773,7 +777,8 @@ static int _call_function_pointer(int fl
+@@ -460,50 +464,62 @@ PyCArg_dealloc(PyCArgObject *self)
+ static PyObject *
+ PyCArg_repr(PyCArgObject *self)
+ {
+-    char buffer[256];
+     switch(self->tag) {
+     case 'b':
+     case 'B':
+-        sprintf(buffer, "<cparam '%c' (%d)>",
++        return PyString_FromFormat("<cparam '%c' (%d)>",
+             self->tag, self->value.b);
+-        break;
+     case 'h':
+     case 'H':
+-        sprintf(buffer, "<cparam '%c' (%d)>",
++        return PyString_FromFormat("<cparam '%c' (%d)>",
+             self->tag, self->value.h);
+-        break;
+     case 'i':
+     case 'I':
+-        sprintf(buffer, "<cparam '%c' (%d)>",
++        return PyString_FromFormat("<cparam '%c' (%d)>",
+             self->tag, self->value.i);
+-        break;
+     case 'l':
+     case 'L':
+-        sprintf(buffer, "<cparam '%c' (%ld)>",
++        return PyString_FromFormat("<cparam '%c' (%ld)>",
+             self->tag, self->value.l);
+-        break;
+ 
+ #ifdef HAVE_LONG_LONG
+     case 'q':
+     case 'Q':
+-        sprintf(buffer,
+-            "<cparam '%c' (%" PY_FORMAT_LONG_LONG "d)>",
++        return PyString_FromFormat("<cparam '%c' (%lld)>",
+             self->tag, self->value.q);
+-        break;
+ #endif
+     case 'd':
+-        sprintf(buffer, "<cparam '%c' (%f)>",
+-            self->tag, self->value.d);
+-        break;
+-    case 'f':
+-        sprintf(buffer, "<cparam '%c' (%f)>",
+-            self->tag, self->value.f);
+-        break;
+-
++    case 'f': {
++        PyObject *s = PyString_FromFormat("<cparam '%c' (", self->tag);
++        if (s == NULL) {
++            return NULL;
++        }
++        PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d);
++        if (f == NULL) {
++            Py_DECREF(s);
++            return NULL;
++        }
++        PyObject *r = PyObject_Repr(f);
++        Py_DECREF(f);
++        if (r == NULL) {
++            Py_DECREF(s);
++            return NULL;
++        }
++        PyString_ConcatAndDel(&s, r);
++        if (s == NULL) {
++            return NULL;
++        }
++        r = PyString_FromString(")>");
++        if (r == NULL) {
++            Py_DECREF(s);
++            return NULL;
++        }
++        PyString_ConcatAndDel(&s, r);
++        return s;
++    }
+     case 'c':
+-        sprintf(buffer, "<cparam '%c' (%c)>",
++        return PyString_FromFormat("<cparam '%c' ('%c')>",
+             self->tag, self->value.c);
+-        break;
+ 
+ /* Hm, are these 'z' and 'Z' codes useful at all?
+    Shouldn't they be replaced by the functionality of c_string
+@@ -512,16 +528,13 @@ PyCArg_repr(PyCArgObject *self)
+     case 'z':
+     case 'Z':
+     case 'P':
+-        sprintf(buffer, "<cparam '%c' (%p)>",
++        return PyUnicode_FromFormat("<cparam '%c' (%p)>",
+             self->tag, self->value.p);
+-        break;
+ 
+     default:
+-        sprintf(buffer, "<cparam '%c' at %p>",
+-            self->tag, self);
+-        break;
++        return PyString_FromFormat("<cparam '%c' at %p>",
++            (unsigned char)self->tag, (void *)self);
+     }
+-    return PyString_FromString(buffer);
+ }
+ 
+ static PyMemberDef PyCArgType_members[] = {
+@@ -773,7 +786,8 @@ static int _call_function_pointer(int fl
                                    ffi_type **atypes,
                                    ffi_type *restype,
                                    void *resmem,
@@ -25,7 +134,7 @@ macOS arm64 support, via MacPorts.
  {
  #ifdef WITH_THREAD
      PyThreadState *_save = NULL; /* For Py_BLOCK_THREADS and Py_UNBLOCK_THREADS */
-@@ -801,6 +806,37 @@ static int _call_function_pointer(int fl
+@@ -801,6 +815,37 @@ static int _call_function_pointer(int fl
      if ((flags & FUNCFLAG_CDECL) == 0)
          cc = FFI_STDCALL;
  #endif
@@ -63,7 +172,7 @@ macOS arm64 support, via MacPorts.
      if (FFI_OK != ffi_prep_cif(&cif,
                                 cc,
                                 argcount,
-@@ -810,6 +846,7 @@ static int _call_function_pointer(int fl
+@@ -810,6 +855,7 @@ static int _call_function_pointer(int fl
                          "ffi_prep_cif failed");
          return -1;
      }
@@ -71,7 +180,7 @@ macOS arm64 support, via MacPorts.
  
      if (flags & (FUNCFLAG_USE_ERRNO | FUNCFLAG_USE_LASTERROR)) {
          error_object = _ctypes_get_errobj(&space);
-@@ -1183,6 +1220,9 @@ PyObject *_ctypes_callproc(PPROC pProc,
+@@ -1183,6 +1229,9 @@ PyObject *_ctypes_callproc(PPROC pProc,
                                       rtype, resbuf,
                                       Py_SAFE_DOWNCAST(argcount,
                                                        Py_ssize_t,
@@ -81,7 +190,7 @@ macOS arm64 support, via MacPorts.
                                                        int)))
          goto cleanup;
  
-@@ -1416,6 +1456,25 @@ copy_com_pointer(PyObject *self, PyObjec
+@@ -1416,6 +1465,25 @@ copy_com_pointer(PyObject *self, PyObjec
  }
  #else
  
@@ -107,7 +216,7 @@ macOS arm64 support, via MacPorts.
  static PyObject *py_dl_open(PyObject *self, PyObject *args)
  {
      char *name;
-@@ -1940,6 +1999,9 @@ PyMethodDef _ctypes_module_methods[] = {
+@@ -1940,6 +2008,9 @@ PyMethodDef _ctypes_module_methods[] = {
       "dlopen(name, flag={RTLD_GLOBAL|RTLD_LOCAL}) open a shared library"},
      {"dlclose", py_dl_close, METH_VARARGS, "dlclose a library"},
      {"dlsym", py_dl_sym, METH_VARARGS, "find symbol in shared library"},

lang/ruby/rubyversion.mk

@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.237 2021/09/25 00:47:26 dholland Exp $
+# $NetBSD: rubyversion.mk,v 1.237.2.3 2021/11/27 22:11:20 tm Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -213,9 +213,9 @@ RUBY_VERSION_REQD?=	${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/}
 .endif
 
 # current supported Ruby's version
-RUBY26_VERSION=		2.6.8
-RUBY27_VERSION=		2.7.4
-RUBY30_VERSION=		3.0.2
+RUBY26_VERSION=		2.6.9
+RUBY27_VERSION=		2.7.5
+RUBY30_VERSION=		3.0.3
 
 # current API compatible version; used for version of shared library
 RUBY26_API_VERSION=	2.6.0
@@ -286,7 +286,7 @@ RUBY_BIGDECIMAL_VERSION=	1.4.1
 RUBY_BUNDLER_VERSION=		1.17.2
 RUBY_CMATH_VERSION=		1.0.0
 RUBY_CSV_VERSION=		3.0.9
-RUBY_DATE_VERSION=		2.0.0
+RUBY_DATE_VERSION=		2.0.2
 RUBY_DBM_VERSION=		1.0.0
 RUBY_E2MMAP_VERSION=		0.1.0
 RUBY_ETC_VERSION=		1.0.1
@@ -338,7 +338,7 @@ RUBY_TEST_UNIT_VERSION=		3.3.4
 RUBY_XML_RPC_VERSION=		0.3.0
 
 # bundled extensions
-RUBY_DATE_VERSION=		3.0.0
+RUBY_DATE_VERSION=		3.0.3
 RUBY_DBM_VERSION=		1.1.0
 RUBY_ETC_VERSION=		1.1.0
 RUBY_FCNTL_VERSION=		1.0.0
@@ -358,7 +358,7 @@ RUBY_JSON_VERSION=		2.3.0
 RUBY_LOGGER_VERSION=		1.4.2
 RUBY_MATRIX_VERSION=		0.2.0
 RUBY_MUTEX_M_VERSION=		0.1.0
-RUBY_OPENSSL_VERSION=		2.1.2
+RUBY_OPENSSL_VERSION=		2.1.3
 RUBY_OSTRUCT_VERSION=		0.2.0
 RUBY_PRIME_VERSION=		0.1.1
 RUBY_PSYCH_VERSION=		3.1.0
@@ -377,37 +377,37 @@ RUBY_SUFFIX=	${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
 RUBY_VERSION=		${RUBY30_VERSION}
 RUBY_ABI_VERSION=	${RUBY_VERSION}
 
-RUBY_RDOC_VERSION=	6.3.1
+RUBY_RDOC_VERSION=	6.3.3
 
 # bundled gems
 RUBY_MINITEST_VERSION=		5.14.2
 RUBY_POWER_ASSERT_VERSION=	1.2.0
 RUBY_RAKE_VERSION=		13.0.3
-RUBY_RBS_VERSION=		1.0.4
+RUBY_RBS_VERSION=		1.4.0
 RUBY_REXML_VERSION=		3.2.5
 RUBY_RSS_VERSION=		0.2.9
 RUBY_TEST_UNIT_VERSION=		3.3.7
-RUBY_TYPEPROF_VERSION=		0.12.0
+RUBY_TYPEPROF_VERSION=		0.15.2
 
 # bundled extensions
 RUBY_BIGDECIMAL_VERSION=	3.0.0
-RUBY_DATE_VERSION=		3.1.0
+RUBY_DATE_VERSION=		3.1.3
 RUBY_DBM_VERSION=		1.1.0
 RUBY_DIGEST_VERSION=		3.0.0
-RUBY_ETC_VERSION=		1.2.0
-RUBY_FCNTL_VERSION=		1.0.0
+RUBY_ETC_VERSION=		1.3.0
+RUBY_FCNTL_VERSION=		1.0.1
 RUBY_FIDDLE_VERSION=		1.0.4
 RUBY_IO_CONSOLE_VERSION=	0.5.7
 RUBY_JSON_VERSION=		2.5.1
-RUBY_OPENSSL_VERSION=		2.2.0
-RUBY_PSYCH_VERSION=		3.3.0
-RUBY_RACC_VERSION=		1.5.1
-RUBY_STRINGIO_VERSION=		3.0.0
-RUBY_STRSCAN_VERSION=		3.0.0
-RUBY_ZLIB_VERSION=		1.1.0
+RUBY_OPENSSL_VERSION=		2.2.1
+RUBY_PSYCH_VERSION=		3.3.2
+RUBY_RACC_VERSION=		1.5.2
+RUBY_STRINGIO_VERSION=		3.0.1
+RUBY_STRSCAN_VERSION=		3.0.1
+RUBY_ZLIB_VERSION=		2.0.0
 
 # bundled libraries
-RUBY_BUNDLER_VERSION=		2.2.22
+RUBY_BUNDLER_VERSION=		2.2.32
 RUBY_CSV_VERSION=		3.1.9
 RUBY_DID_YOU_MEAN_VERSION=	1.5.0
 RUBY_FILEUTILS_VERSION=		1.5.0

lang/ruby26-base/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2021/07/07 15:15:19 taca Exp $
+$NetBSD: distinfo,v 1.11.2.1 2021/11/27 21:53:13 tm Exp $
 
-SHA1 (ruby-2.6.8.tar.xz) = fa5ad518ef31bbf5c3386dbcec7b57196a1e618e
-RMD160 (ruby-2.6.8.tar.xz) = d2604765e5d360efa21f55e6eca90a6e026a52c1
-SHA512 (ruby-2.6.8.tar.xz) = d040ad2238523587d8f356fcb796b8b6ad7f8caff7dd6df09e3f7efcbfa0369e33600e78c7f2bc713ae77c040757cce5c4fec223cb9070209f2bf741899c556d
-Size (ruby-2.6.8.tar.xz) = 11599488 bytes
+SHA1 (ruby-2.6.9.tar.xz) = fc67ca162010aac4af49d73a8c48be5cb2fb5907
+RMD160 (ruby-2.6.9.tar.xz) = 0686248d52eacbebe0c54cc8b7d15cf9bc6fee32
+SHA512 (ruby-2.6.9.tar.xz) = f60aa89e685cea324185eb0d13e6b44caef4e4f761cbf9ea1386ae70e39faf3866ac01e4bb5354574f2583e74290b8c80eaf63d126040d52368be6c771476451
+Size (ruby-2.6.9.tar.xz) = 11590064 bytes
 SHA1 (patch-configure) = ccfad7b5e35e87308e187e6c5fb3ffea57ad763d
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e

lang/ruby27-base/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2021/04/11 12:32:03 taca Exp $
+@comment $NetBSD: PLIST,v 1.4.4.1 2021/11/27 22:02:59 tm Exp $
 bin/bundle${RUBY_SUFFIX}
 bin/bundler${RUBY_SUFFIX}
 bin/erb${RUBY_SUFFIX}
@@ -348,14 +348,6 @@ ${RUBY_LIB}/drb/timeridconv.rb
 ${RUBY_LIB}/drb/unix.rb
 ${RUBY_LIB}/drb/weakidconv.rb
 ${RUBY_LIB}/erb.rb
-${RUBY_LIB}/exe/bundle
-${RUBY_LIB}/exe/bundler
-${RUBY_LIB}/exe/irb
-${RUBY_LIB}/exe/racc
-${RUBY_LIB}/exe/racc2y
-${RUBY_LIB}/exe/rdoc
-${RUBY_LIB}/exe/ri
-${RUBY_LIB}/exe/y2racc
 ${RUBY_LIB}/expect.rb
 ${RUBY_LIB}/fileutils.rb
 ${RUBY_LIB}/find.rb
@@ -1475,7 +1467,7 @@ ${GEM_HOME}/gems/xmlrpc-${RUBY_XML_RPC_VERSION}/xmlrpc.gemspec
 ${GEM_HOME}/specifications/default/benchmark-0.1.0.gemspec
 ${GEM_HOME}/specifications/default/bigdecimal-${RUBY_BIGDECIMAL_VERSION}.gemspec
 ${GEM_HOME}/specifications/default/bundler-${RUBY_BUNDLER_VERSION}.gemspec
-${GEM_HOME}/specifications/default/cgi-0.1.0.gemspec
+${GEM_HOME}/specifications/default/cgi-0.1.0.1.gemspec
 ${GEM_HOME}/specifications/default/csv-${RUBY_CSV_VERSION}.gemspec
 ${GEM_HOME}/specifications/default/date-${RUBY_DATE_VERSION}.gemspec
 ${GEM_HOME}/specifications/default/dbm-${RUBY_DBM_VERSION}.gemspec

lang/ruby27-base/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2021/07/07 15:23:08 taca Exp $
+$NetBSD: distinfo,v 1.5.2.1 2021/11/27 22:02:59 tm Exp $
 
-SHA1 (ruby-2.7.4.tar.xz) = 6e044d835f9f432cfa9441241c1ef66e3d607cbf
-RMD160 (ruby-2.7.4.tar.xz) = 6df300c44653c3c2ba0bff4f84da71cd4bc084a1
-SHA512 (ruby-2.7.4.tar.xz) = 2cbb70ecfdd69120e789023ddb2b25cab0d03bc33fdc367a8f74ca8a3ee785c18c8ded9de3ecee627c7e275ffb85147e6abf921b6a61e31851b37c7fedf45bf9
-Size (ruby-2.7.4.tar.xz) = 12067588 bytes
+SHA1 (ruby-2.7.5.tar.xz) = 1d04fbf24150eaa1297a7ef4c7057ec0a9dca527
+RMD160 (ruby-2.7.5.tar.xz) = 6e62a7c30ea1295f0c5b9ec56027c1828ed72d89
+SHA512 (ruby-2.7.5.tar.xz) = 21c8a713e3ce115fc4c405113ac691ddcefc3419f528b93ca1ac59e7052c1b6e9e241da0e570e291e567f28f3d840824dbcc5967b216cbe7d6ca7a05580fa311
+Size (ruby-2.7.5.tar.xz) = 12072980 bytes
 SHA1 (patch-configure) = 5ee800f6824b18efd06e56a659235ea784819f2e
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-lib_mkmf.rb) = 4a3cd18548dbdf43a13695d4e76f817c0347e335