Pullup tickets #6385 and #6386

Pullup ticket #6386 - requested by nia
www/firefox78-l10n: dependent update Revisions pulled up: - www/firefox78-l10n/Makefile 1.6 - www/firefox78-l10n/distinfo 1.6 --- Module Name: pkgsrc Committed By: nia Date: Thu Dec 17 13:25:31 UTC 2020 Modified Files: pkgsrc/www/firefox78-l10n: Makefile distinfo Log Message: firefox78-l10n: Sync with firefox78
2020-12-19 20:39:05 +00:00 · 2020-12-19 20:38:42 +00:00 · 2020-12-19 20:38:04 +00:00 · 2020-12-11 10:02:51 +00:00 · 2020-12-11 10:00:20 +00:00 · 2020-12-11 08:50:56 +00:00
195 changed files with 11929 additions and 4447 deletions
--- a/chat/profanity/Makefile
+++ b/chat/profanity/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/09/08 19:13:49 nia Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2020/10/23 17:42:47 bsiegert Exp $

 DISTNAME=	profanity-0.9.5
 CATEGORIES=	chat
@ -37,6 +37,7 @@ BUILDLINK_API_DEPENDS.libmesode+=	libmesode>=0.9.1
 .include "../../chat/libmesode/buildlink3.mk"
 .include "../../chat/libotr/buildlink3.mk"
 .include "../../chat/libsignal-protocol-c/buildlink3.mk"
+BUILDLINK_API_DEPENDS.sqlite3+=		sqlite3>=3.22.0
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
--- a/databases/ruby-activerecord60/distinfo
+++ b/databases/ruby-activerecord60/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/09/10 14:30:02 taca Exp $
+$NetBSD: distinfo,v 1.5.2.1 2020/10/23 16:25:00 bsiegert Exp $

-SHA1 (activerecord-6.0.3.3.gem) = ffb2443a7a961876a06c59c9ccabda1dd9d40763
-RMD160 (activerecord-6.0.3.3.gem) = 1abff184200638053c556d9b9f2c6353900891f4
-SHA512 (activerecord-6.0.3.3.gem) = d9e77f1ae3e6ea90aa0d3f01cb4c6ec8adc431971b89c5b11a0c3fb781e01f70bd8b10b063709e8c80b97c135d613eab09d772c371e0d96df91cacbc5cc1c05f
-Size (activerecord-6.0.3.3.gem) = 407552 bytes
+SHA1 (activerecord-6.0.3.4.gem) = 1f8b15b082531461d7fa029e238b4a53034ddb5c
+RMD160 (activerecord-6.0.3.4.gem) = 3074fa857ef6b461223757352596200c6e87f11b
+SHA512 (activerecord-6.0.3.4.gem) = 39b63f87d024b7044da70c90470f76b2eb9fb2370339c29ef6d12b3569ca0fbd78f5987910995bc9052eb28ec9f953d278f6deb5eb03beb172d60d4d6309ab4e
+Size (activerecord-6.0.3.4.gem) = 407552 bytes
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2020/07/17 23:40:43 wiz Exp $
+# $NetBSD: Makefile,v 1.51.2.1 2020/10/22 16:48:07 bsiegert Exp $

-DISTNAME=	apache-ant-1.10.8-bin
+DISTNAME=	apache-ant-1.10.9-bin
 PKGNAME=	${DISTNAME:S/-bin//}
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE:=ant/binaries/}
--- a/devel/apache-ant/PLIST
+++ b/devel/apache-ant/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2020/07/17 23:40:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.26.2.1 2020/10/22 16:48:07 bsiegert Exp $
 bin/ant
 bin/antRun
 lib/java/ant/ant-antlr.jar
@ -274,6 +274,7 @@ share/doc/java/ant/api/org/apache/tools/ant/ProjectHelper.OnMissingExtensionPoin
 share/doc/java/ant/api/org/apache/tools/ant/ProjectHelper.html
 share/doc/java/ant/api/org/apache/tools/ant/ProjectHelperRepository.html
 share/doc/java/ant/api/org/apache/tools/ant/PropertyHelper.Delegate.html
+share/doc/java/ant/api/org/apache/tools/ant/PropertyHelper.PropertyEnumerator.html
 share/doc/java/ant/api/org/apache/tools/ant/PropertyHelper.PropertyEvaluator.html
 share/doc/java/ant/api/org/apache/tools/ant/PropertyHelper.PropertySetter.html
 share/doc/java/ant/api/org/apache/tools/ant/PropertyHelper.html
--- a/devel/apache-ant/distinfo
+++ b/devel/apache-ant/distinfo
@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.33 2020/07/17 23:40:43 wiz Exp $
+$NetBSD: distinfo,v 1.33.2.1 2020/10/22 16:48:07 bsiegert Exp $

-SHA1 (apache-ant-1.10.8-bin.tar.xz) = 1b59eee456b5a814ecb1ab51b509c1a7ddd96b92
-RMD160 (apache-ant-1.10.8-bin.tar.xz) = bb83f61036b06c71b37d42bca2bfcbae4a097209
-SHA512 (apache-ant-1.10.8-bin.tar.xz) = b03be67dbda9b45a7838c304db7e6750e4907c6eef51a8de30d929f7e5b0da61b8a82fde2b590a0842acffc0f1098bc6bdfd16664a72c6c6f883990e166acdd4
-Size (apache-ant-1.10.8-bin.tar.xz) = 5011528 bytes
+SHA1 (apache-ant-1.10.9-bin.tar.xz) = 2fc1c47d57a31da0c59bc16e3d5ca5edfd2e3a48
+RMD160 (apache-ant-1.10.9-bin.tar.xz) = 164c8c9a7de7891301c90a17a2eeac95cba3f3e4
+SHA512 (apache-ant-1.10.9-bin.tar.xz) = ecb09c83b24f98b9475849548558809ff21c88f8d39fbc3559f24df5fc640a50bbd885681d9c676285d8843bd3dc09a6238189c13a4238ba5c01385a5bd29542
+Size (apache-ant-1.10.9-bin.tar.xz) = 5022448 bytes
 SHA1 (patch-aa) = 5f614ed545c7cca33096af1f4975f7947439286f
--- a/devel/libFoundation/patches/patch-aa
+++ b/devel/libFoundation/patches/patch-aa
@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/04/18 02:27:21 rh Exp $
+$NetBSD: patch-aa,v 1.1 2009/04/18 02:19:23 rh Exp $

--- GNUmakefile.orig	2009-04-18 11:56:31.000000000 +1000
+--- GNUmakefile.orig	2009-04-18 10:49:03.000000000 +1000
 +++ GNUmakefile
@@ -38,7 +38,7 @@ GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
 include $(GNUSTEP_MAKEFILES)/common.make
 include ./Version
 
 -SUBPROJECTS = Foundation Resources examples
-+SUBPROJECTS = examples
+SUBPROJECTS = Foundation Resources
 
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 
--- a/devel/ruby-activejob60/distinfo
+++ b/devel/ruby-activejob60/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/09/10 14:30:02 taca Exp $
+$NetBSD: distinfo,v 1.5.2.1 2020/10/23 16:25:01 bsiegert Exp $

-SHA1 (activejob-6.0.3.3.gem) = 09d536656bce51729710a063ac1d8cd3f0a70607
-RMD160 (activejob-6.0.3.3.gem) = 076e8c180ae14034c7528e0f173d23694a627407
-SHA512 (activejob-6.0.3.3.gem) = 94208bfda571133dca68356e0df504f4dff89d323a0ab892f02bdf1549846cbdf757fc0d237f02261af81d067270730362ade128507282dc9f7275faffd5a6b1
-Size (activejob-6.0.3.3.gem) = 31744 bytes
+SHA1 (activejob-6.0.3.4.gem) = 5405baf9298cc3af01a5160ebed4ebb79eec0a69
+RMD160 (activejob-6.0.3.4.gem) = b4d86c3e6a5689534bef3776e673e768c91531df
+SHA512 (activejob-6.0.3.4.gem) = 10be7bdd95a1a3b5c76caa94bc33660712c68d9a84aa44517e003a0d5eb0949de44e009499641545e82f472517395c17f3dc9467982b0e924e8b027988d1cd3b
+Size (activejob-6.0.3.4.gem) = 31744 bytes
--- a/devel/ruby-activemodel60/distinfo
+++ b/devel/ruby-activemodel60/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/09/10 14:30:02 taca Exp $
+$NetBSD: distinfo,v 1.5.2.1 2020/10/23 16:25:01 bsiegert Exp $

-SHA1 (activemodel-6.0.3.3.gem) = 42037b04104f997b014b0e2754b0fd540337a996
-RMD160 (activemodel-6.0.3.3.gem) = 8ebdb3e1d99e015993abbc750d43d0d4fd88eb3f
-SHA512 (activemodel-6.0.3.3.gem) = d530e5939de532cfaf073054f1a87e2daeebcf3ef5b522b9c3c683ffdd9b03694dca8f04becc5a12a2283adc05d520ed856bd8a37e37a1a4fe34d9fb96010e73
-Size (activemodel-6.0.3.3.gem) = 58880 bytes
+SHA1 (activemodel-6.0.3.4.gem) = 777cf1db073a988d47e1669f494801065560772d
+RMD160 (activemodel-6.0.3.4.gem) = fa49a5371ce794461f5c12c34741ed2e75409795
+SHA512 (activemodel-6.0.3.4.gem) = 2f4cea8040e95f72794508602cf74a72166014ee91977d72ecf8e7e4780782d96e6319c316821db914f3d86802da7406693492f8cd3e29047eee0b467a267408
+Size (activemodel-6.0.3.4.gem) = 58880 bytes
--- a/devel/ruby-activestorage60/distinfo
+++ b/devel/ruby-activestorage60/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/09/10 14:30:03 taca Exp $
+$NetBSD: distinfo,v 1.5.2.1 2020/10/23 16:25:01 bsiegert Exp $

-SHA1 (activestorage-6.0.3.3.gem) = 4f151eaf3145ffcf247072b59fdd4e53eca5f3d0
-RMD160 (activestorage-6.0.3.3.gem) = ae5ec962dffb5143661c5e63d8ad19b834ae8233
-SHA512 (activestorage-6.0.3.3.gem) = 781afd9d2325a9c76dd1c08d6248f83b7ddb334cdeb44e2f2ed73b35229fd466bb6254651b63eb68e273db45049de9c822068256675b4c1a19bae987a2845801
-Size (activestorage-6.0.3.3.gem) = 50688 bytes
+SHA1 (activestorage-6.0.3.4.gem) = 07d31d2e1c690384aa6e196c9e844f953551918b
+RMD160 (activestorage-6.0.3.4.gem) = 8f43dac4711ebf29fdd305ec42ba4b1f11c25988
+SHA512 (activestorage-6.0.3.4.gem) = 16768e4fa25d6b3e7c75b0bed5bfe070bd9406542089230ab4c7a0add93f4978f7bf1d9c609f753cc8034482b126a0f64100aeedcc9f9fa7dd8c5c80a23ed3bd
+Size (activestorage-6.0.3.4.gem) = 50688 bytes
--- a/devel/ruby-activesupport60/distinfo
+++ b/devel/ruby-activesupport60/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/09/10 14:30:02 taca Exp $
+$NetBSD: distinfo,v 1.5.2.1 2020/10/23 16:25:01 bsiegert Exp $

-SHA1 (activesupport-6.0.3.3.gem) = 673e08bfcce6de903d0dfc4c0bb80f67b46c76d4
-RMD160 (activesupport-6.0.3.3.gem) = 874164a95e8a3b7998dad2d6d8435a10e3cf0283
-SHA512 (activesupport-6.0.3.3.gem) = 050599b16a63752df1f347a34e4faccb960ee3f57012032960f6792b603c09245773fd87ee9c1a0af80335ee89d4a6b3efd3c8c2d7eda73126c5b548b3c06061
-Size (activesupport-6.0.3.3.gem) = 214016 bytes
+SHA1 (activesupport-6.0.3.4.gem) = 0c145c62c94dae5c36641d0abcd0026ff40cba95
+RMD160 (activesupport-6.0.3.4.gem) = e90851fd859759da4b4c7359178c3183ee054989
+SHA512 (activesupport-6.0.3.4.gem) = 98668d420f2b3d207ae1513bf9736089b51becb3e9272d5f30e2ca616ee69ee47ce91e30f5e76ada7e9711f08d0acb513697686a7b83fa9582064c280c634117
+Size (activesupport-6.0.3.4.gem) = 214016 bytes
--- a/devel/ruby-railties60/distinfo
+++ b/devel/ruby-railties60/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/09/10 14:30:03 taca Exp $
+$NetBSD: distinfo,v 1.5.2.1 2020/10/23 16:25:01 bsiegert Exp $

-SHA1 (railties-6.0.3.3.gem) = 504ab700f86737a5747f1557fbef1fac39217ed8
-RMD160 (railties-6.0.3.3.gem) = 81aecd66b50b8b1fccd688ba88039b192c0da511
-SHA512 (railties-6.0.3.3.gem) = 2aed3095f1c2a6de73ccc9e2ed8aff9aca1a158b395e8a047652d9feaa8b7621f278aebd484f6734313787a47dfde912d7c2c742098a5962ebbd7cc69785933b
-Size (railties-6.0.3.3.gem) = 455168 bytes
+SHA1 (railties-6.0.3.4.gem) = 6066d3a3975184aa566c803aa6c573086f0b296e
+RMD160 (railties-6.0.3.4.gem) = a2b10b6c546b6b667f9262bea0678a271830f405
+SHA512 (railties-6.0.3.4.gem) = 3d0df017fa3533690a54bd3eeae11c7b0ae97644de7e9ec27e7f8a8414b95f4a8ab3d925a90dda43859266123b6f1d7b3228ab549e800ecd1d3fafc5d6a3d59a
+Size (railties-6.0.3.4.gem) = 455168 bytes
--- a/doc/CHANGES-pkgsrc-2020Q3
+++ b/doc/CHANGES-pkgsrc-2020Q3
@ -0,0 +1,139 @@
+$NetBSD: CHANGES-pkgsrc-2020Q3,v 1.1.2.14 2020/12/19 20:39:05 bsiegert Exp $
+
+Changes to packages and infrastructure on the pkgsrc-2020Q3 branch:
+
+Pullup ticket #6328 - requested by martin
+security/openssl: sparc64 build fix
+
+Pullup ticket #6329 - requested by gdt
+lang/rust: NetBSD build fix
+
+Pullup ticket #6331 - requested by hauke
+editors/xemacs: Linux build fix
+
+Pullup ticket #6330 - requested by martin
+www/firefox52: sparc64 build fix
+
+Pullup ticket #6332 - requested by bouyer
+sysutils/xenkernel411: security fix
+sysutils/xenkernel413: security fix
+
+Pullup ticket #6346 - requested by maya
+graphics/freetype2: security update
+
+Pullup ticket #6347 - requested by maya
+pkgtools/x11-links: dependency-driven update                                   
+
+Pullup ticket #6333 - requested by taca
+lang/php73: security update
+
+Pullup ticket #6334 - requested by taca
+lang/php74: security update
+
+Pullup ticket #6335 - requested by taca
+lang/php72: security update
+
+Pullup ticket #6336 - requested by taca
+lang/ruby27-base: security update
+
+Pullup ticket #6337 - requested by taca
+lang/ruby26-base: security patch
+
+Pullup ticket #6338 - requested by taca
+lang/ruby25-base: security patch
+
+Pullup ticket #6339 - requested by taca
+www/contao35: security patch
+
+Pullup ticket #6345 - requested by khorben
+security/py-libtaxii: security fix
+
+Pullup ticket #6355 - requested by bouyer
+sysutils/xenkernel411: security fix
+sysutils/xenkernel413: security fix
+
+Pullup ticket #6340 - requested by wiz
+devel/apache-ant: security fix
+
+Pullup ticket #6348 - requested by nia
+www/firefox78: security fix
+
+Pullup ticket #6349 - requested by nia
+www/firefox78-l10n: dependent update
+
+Pullup ticket #6344 - requested by taca
+www/ruby-rails60: security fix
+
+Pullup ticket #6341 - requested by wiz
+security/tor-browser: security fix
+
+Pullup ticket #6350 - requested by nia
+wm/xfce4-wm: NetBSD 8 build fix
+
+Pullup ticket #6351 - requested by nia
+x11/vte3: NetBSD 8 build fix
+
+Pullup ticket #6352 - requested by nia
+graphics/openexr: NetBSD 8 build fix
+
+Pullup ticket #6353 - requested by nia
+chat/profanity: NetBSD 8 build fix
+
+Pullup ticket #6354 - requested by maya
+print/ghostscript-agpl: dependecy update triggered build fix
+
+Pullup ticket #6329 (part 2) - requested by maya
+lang/rust: NetBSD 9 build fix (accidentally broken)
+
+Pullup ticket #6343 - requested by he
+lang/libunwind: PowerPC build fix
+
+Pullup ticket #6356 - requested by maya
+www/firefox: security update
+www/firefox-l10n: security update
+
+Pullup ticket #6360 - requested by khorben
+misc/tmux: security fix
+
+Pullup ticket #6361 - requested by taca
+net/samba4: security fix
+
+Pullup ticket #6357 - requested by wiz
+security/tor-browser-noscript: security fix
+
+Pullup ticket #6358 - requested by wiz
+security/tor-browser: security fix
+
+Pullup ticket #6367 - requested by leot
+net/youtube-dl: updates and bugfixes
+
+Pullup ticket #6368 - requested by wiz
+graphics/ImageMagick: security fix
+
+Pullup ticket #6370 - requested by nia
+www/firefox78: security fix
+
+Pullup ticket #6371 - requested by nia
+www/firefox78-l10n: dependent update
+
+Pullup ticket #6369 - requested by riastradh
+www/firefox78: build fix
+
+Pullup ticket #6378 - requested by riastradh
+www/gitea: build fix, security fix
+
+Pullup ticket #6372 - requested by wiz
+mail/neomutt: security fix
+
+Pullup ticket #6373 - requested by wiz
+graphics/ImageMagick: security fix
+
+Pullup ticket #6384 - requested by wiz
+security/openssl: security fix
+
+Pullup ticket #6385 - requested by nia
+www/firefox78: security fix
+
+Pullup ticket #6386 - requested by nia
+www/firefox78-l10n: dependent update
+
--- a/editors/xemacs-current-nox11/Makefile
+++ b/editors/xemacs-current-nox11/Makefile
@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2019/10/08 12:40:55 hauke Exp $
+# $NetBSD: Makefile,v 1.11.8.1 2020/10/04 09:28:06 bsiegert Exp $

 PKGNAME=	${DISTNAME:S/-/-nox11-/}
-PKGREVISION=	7
+PKGREVISION=	8
 COMMENT=	*BETA* XEmacs text editor version ${PKGVERSION_NOREV} (no X11 support)
-# Version information in ../../editors/xemacs-current/Makefile.common

 .include "../../editors/xemacs-current/options.mk"
 .include "../../editors/xemacs-current/Makefile.common"
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.106 2020/09/24 17:02:02 hauke Exp $
+# $NetBSD: Makefile,v 1.106.2.1 2020/10/04 09:28:06 bsiegert Exp $

 PKGNAME=	${DISTNAME}
-PKGREVISION=	14
+PKGREVISION=	15
 COMMENT=	*BETA* XEmacs text editor version ${PKGVERSION_NOREV}

 # extra options for x11 support, not for sharing with xemacs-current-nox11
-# Version information in ../../editors/xemacs-current/Makefile.common
-
 PKG_SUPPORTED_OPTIONS+=		x11 xft xface
 PKG_SUGGESTED_OPTIONS+=		x11

--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2019/11/27 15:11:45 hauke Exp $
+$NetBSD: distinfo,v 1.37.8.1 2020/10/04 09:28:06 bsiegert Exp $

 SHA1 (xemacs-21.5.34.tar.gz) = ed1fe3ff6ce6eeb9ff75ac0ee34c6530e1c355ce
 RMD160 (xemacs-21.5.34.tar.gz) = 2f6a5bc7fd72508722dded16ee7742db3e87ffaf
@ -13,4 +13,5 @@ SHA1 (patch-modules_common_Makefile.common) = d62a23a05e72cc196557e2f7fbbccea791
 SHA1 (patch-src_Makefile.in.in) = 7a7ea5fe03b11e8690f44f4dbef17e793fbf50f2
 SHA1 (patch-src_dired.c) = d850495e567224dc7a43e1db74f4e305a906f177
 SHA1 (patch-src_lisp.h) = c5f3b5f920ec6d451a5d5c5d1e414d6ae3d6660f
+SHA1 (patch-src_process.c) = 4cca9085f0e34ad1adf44ea006df7c2c370beeb9
 SHA1 (patch-src_unexelf.c) = 96b2cf1d2512ad23fca98db9b48c34533bba8b66
--- a/editors/xemacs-current/patches/patch-src_process.c
+++ b/editors/xemacs-current/patches/patch-src_process.c
@ -0,0 +1,21 @@
+$NetBSD: patch-src_process.c,v 1.1.2.2 2020/10/04 09:28:06 bsiegert Exp $
+
+Linux glibc 2.32+ has removed sys_siglist
+
+--- src/process.c.orig	2013-08-21 17:43:44.000000000 +0000
+++ src/process.c
+@@ -1568,10 +1568,14 @@ See `set-process-sentinel' for more info
+ const char *
+ signal_name (int signum)
+ {
+#if defined(LINUX) && !defined(SYS_SIGLIST_DECLARED)
+  return (const char *)strsignal(signum);
+#else
+   if (signum >= 0 && signum < NSIG)
+     return (const char *) sys_siglist[signum];
+ 
+   return (const char *) GETTEXT ("unknown signal");
+#endif
+ }
+ 
+ void
--- a/editors/xemacs-nox11/Makefile
+++ b/editors/xemacs-nox11/Makefile
@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2020/08/31 18:09:26 wiz Exp $
+# $NetBSD: Makefile,v 1.35.2.1 2020/10/04 09:28:06 bsiegert Exp $

 PKGNAME=	${DISTNAME:S/-/-nox11-/}
-PKGREVISION=	13
+PKGREVISION=	14
 COMMENT=	XEmacs text editor version 21 (no x11 support)

-# Version information in ../../editors/xemacs/Makefile.common
-
 .include "../../editors/xemacs/options.mk"

 .include "../../editors/xemacs/Makefile.common"
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.132 2020/09/24 17:02:01 hauke Exp $
+# $NetBSD: Makefile,v 1.132.2.1 2020/10/04 09:28:06 bsiegert Exp $

 PKGNAME=	${DISTNAME}
-PKGREVISION=	14
+PKGREVISION=	15
 COMMENT=	XEmacs text editor version 21.4

 # extra options for x11 support, not for sharing with xemacs-current-nox11
-# Version information in ../../editors/xemacs/Makefile.common
-
 PKG_SUPPORTED_OPTIONS+=		x11 xface
 PKG_SUGGESTED_OPTIONS+=		x11

--- a/editors/xemacs/distinfo
+++ b/editors/xemacs/distinfo
@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2019/11/27 14:35:16 hauke Exp $
+$NetBSD: distinfo,v 1.31.8.1 2020/10/04 09:28:06 bsiegert Exp $

 SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc
 RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b
@ -18,6 +18,7 @@ SHA1 (patch-src_Makefile.in.in) = 8d2c262983ff16197c99429e7d4cc80cd8371775
 SHA1 (patch-src_config.h.in) = 25ac897560abad51d83b58818e1dc2e77a8519e4
 SHA1 (patch-src_emacs.c) = 19bbba8b9a777388060bab637b2bdc5e9027e11f
 SHA1 (patch-src_lisp.h) = ed1210a179f7dce537634e3129acc93f9c9b5966
+SHA1 (patch-src_process.c) = b33b37e7e68bd49036d90cfed206170456a4b443
 SHA1 (patch-src_sound.c) = fd3717943310c049fbcc8598b072d80d9812ae20
 SHA1 (patch-src_unexelf.c) = 5147a3f41d1188aaf08b99e768d8b93e9e28d305
 SHA1 (patch-src_unexfreebsd.c) = 8bcbd103884430cec31c584bc489e4ab98d79448
--- a/editors/xemacs/patches/patch-src_process.c
+++ b/editors/xemacs/patches/patch-src_process.c
@ -0,0 +1,21 @@
+$NetBSD: patch-src_process.c,v 1.1.2.2 2020/10/04 09:28:06 bsiegert Exp $
+
+Linux glibc 2.32+ has removed sys_siglist
+
+--- src/process.c.orig	2015-03-25 11:25:33.000000000 +0000
+++ src/process.c
+@@ -1310,10 +1310,14 @@ See `set-process-sentinel' for more info
+ const char *
+ signal_name (int signum)
+ {
+#if defined(LINUX) && !defined(SYS_SIGLIST_DECLARED)
+  return (const char *)strsignal(signum);
+#else
+   if (signum >= 0 && signum < NSIG)
+     return (const char *) sys_siglist[signum];
+ 
+   return (const char *) GETTEXT ("unknown signal");
+#endif
+ }
+ 
+ void
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.216 2020/09/20 08:39:06 wiz Exp $
+# $NetBSD: Makefile.common,v 1.216.2.2 2020/12/11 10:00:20 bsiegert Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile

 IM_MAJOR_VER=		7.0.10
-IM_MINOR_VER=		30
+IM_MINOR_VER=		41
 IM_MAJOR_LIB_VER=	7

 .if (${IM_MINOR_VER} != NONE)
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.111 2020/07/29 11:21:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.111.2.2 2020/12/11 10:00:20 bsiegert Exp $
 bin/Magick++-config
 bin/MagickCore-config
 bin/MagickWand-config
@ -356,717 +356,7 @@ share/doc/ImageMagick-7/www/Magick++/thumbnail-sample-plain.jpg
 share/doc/ImageMagick-7/www/advanced-unix-installation.html
 share/doc/ImageMagick-7/www/advanced-windows-installation.html
 share/doc/ImageMagick-7/www/animate.html
-share/doc/ImageMagick-7/www/api.html
 share/doc/ImageMagick-7/www/api/Image++.html
-share/doc/ImageMagick-7/www/api/MagickCore/ImageMagick_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/ImageMagick_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/MagickCore_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/MagickCore_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/PreRvIcccm_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/PreRvIcccm_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/PreRvIcccm_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/animate-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/animate-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/animate_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/animate_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/animate_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/annotate_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/annotate_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/annotate_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/annotated.html
-share/doc/ImageMagick-7/www/api/MagickCore/api_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/api_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/artifact_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/artifact_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/artifact_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/blob-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/blob-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/blob_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/blob_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/blob_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/cache-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/cache-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/cache-view_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/cache-view_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/cache-view_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/cache_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/cache_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/cache_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/classes.html
-share/doc/ImageMagick-7/www/api/MagickCore/client_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/client_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/client_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/coder_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/coder_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/coder_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/color-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/color-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/color_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/color_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/color_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/colorspace-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/colorspace-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/colorspace_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/colorspace_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/colorspace_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/compare_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/compare_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/compare_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/composite-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/composite-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/composite_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/composite_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/composite_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/compress_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/compress_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/compress_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/configure_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/configure_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/configure_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/constitute_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/constitute_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/constitute_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/decorate_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/decorate_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/decorate_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/delegate_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/delegate_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/delegate_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/deprecate_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/deprecate_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/deprecate_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/dir_b44b349db36f8365f5234e57d3038770.html
-share/doc/ImageMagick-7/www/api/MagickCore/dirs.html
-share/doc/ImageMagick-7/www/api/MagickCore/display-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/display-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/display_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/display_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/display_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/distort_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/distort_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/distort_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/doxygen.css
-share/doc/ImageMagick-7/www/api/MagickCore/doxygen.png
-share/doc/ImageMagick-7/www/api/MagickCore/draw-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/draw-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/draw_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/draw_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/draw_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/effect_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/effect_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/effect_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/enhance_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/enhance_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/enhance_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/exception-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/exception-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/exception_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/exception_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/exception_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/files.html
-share/doc/ImageMagick-7/www/api/MagickCore/ftv2blank.png
-share/doc/ImageMagick-7/www/api/MagickCore/ftv2doc.png
-share/doc/ImageMagick-7/www/api/MagickCore/ftv2folderclosed.png
-share/doc/ImageMagick-7/www/api/MagickCore/ftv2folderopen.png
-share/doc/ImageMagick-7/www/api/MagickCore/ftv2lastnode.png
-share/doc/ImageMagick-7/www/api/MagickCore/ftv2link.png
-share/doc/ImageMagick-7/www/api/MagickCore/ftv2mlastnode.png
-share/doc/ImageMagick-7/www/api/MagickCore/ftv2mnode.png
-share/doc/ImageMagick-7/www/api/MagickCore/ftv2node.png
-share/doc/ImageMagick-7/www/api/MagickCore/ftv2plastnode.png
-share/doc/ImageMagick-7/www/api/MagickCore/ftv2pnode.png
-share/doc/ImageMagick-7/www/api/MagickCore/ftv2vertline.png
-share/doc/ImageMagick-7/www/api/MagickCore/functions.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x61.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x62.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x63.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x64.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x65.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x66.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x67.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x68.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x69.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x6b.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x6c.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x6d.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x6e.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x6f.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x70.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x71.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x72.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x73.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x74.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x75.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x76.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x77.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x78.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x79.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_0x7a.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_func.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x61.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x62.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x63.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x64.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x65.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x66.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x67.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x68.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x69.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x6b.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x6c.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x6d.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x6e.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x6f.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x70.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x71.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x72.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x73.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x74.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x75.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x76.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x77.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x78.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x79.html
-share/doc/ImageMagick-7/www/api/MagickCore/functions_vars_0x7a.html
-share/doc/ImageMagick-7/www/api/MagickCore/fx-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/fx-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/fx_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/fx_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/fx_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/gem_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/gem_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/gem_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/geometry_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/geometry_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/geometry_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x61.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x62.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x63.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x64.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x65.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x66.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x67.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x68.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x69.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x6a.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x6b.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x6c.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x6d.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x6e.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x6f.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x70.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x71.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x72.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x73.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x74.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x75.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x76.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x77.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x78.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x79.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_0x7a.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x61.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x62.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x63.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x64.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x65.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x66.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x67.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x68.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x69.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x6b.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x6c.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x6d.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x6e.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x6f.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x70.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x71.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x72.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x73.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x74.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x75.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x76.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x77.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x78.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_defs_0x79.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_enum.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x62.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x63.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x64.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x65.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x66.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x67.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x68.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x69.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x6a.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x6b.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x6c.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x6d.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x6e.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x6f.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x70.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x71.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x72.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x73.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x74.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x75.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x76.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x77.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x78.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x79.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_eval_0x7a.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x62.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x63.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x64.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x65.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x66.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x67.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x68.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x69.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x6a.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x6b.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x6c.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x6d.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x6e.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x6f.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x70.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x71.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x72.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x73.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x74.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x75.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x76.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x77.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x78.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x79.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_func_0x7a.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_type.html
-share/doc/ImageMagick-7/www/api/MagickCore/globals_vars.html
-share/doc/ImageMagick-7/www/api/MagickCore/hashmap_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/hashmap_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/hashmap_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/identify_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/identify_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/identify_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/image-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/image-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/image_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/image_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/image_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/index.html
-share/doc/ImageMagick-7/www/api/MagickCore/layer_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/layer_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/layer_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/list_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/list_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/list_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/locale_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/locale___8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/locale___8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/log_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/log_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/log_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/mac_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/mac_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/mac_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/magic_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/magic_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/magic_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/magick-config_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/magick-config_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/magick-type_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/magick-type_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/magick_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/magick_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/magick_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/main.html
-share/doc/ImageMagick-7/www/api/MagickCore/matrix_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/matrix_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/matrix_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/memory_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/memory___8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/memory___8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/methods_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/methods_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/mime-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/mime-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/mime_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/mime_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/mime_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/module_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/module_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/module_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/monitor_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/monitor_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/monitor_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/montage_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/montage_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/montage_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/nt-base_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/nt-base_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/nt-base_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/nt-feature_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/nt-feature_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/nt-feature_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/option_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/option_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/option_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/paint_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/paint_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/paint_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/pixel-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/pixel-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/pixel_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/pixel_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/pixel_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/prepress_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/prepress_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/prepress_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/profile_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/profile_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/profile_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/property_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/property_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/property_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/quantize_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/quantize_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/quantize_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/quantum-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/quantum-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/quantum_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/quantum_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/quantum_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/random_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/random___8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/random___8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/registry_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/registry_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/registry_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/resample_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/resample_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/resample_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/resize-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/resize-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/resize_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/resize_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/resize_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/resource_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/resource___8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/resource___8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/segment_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/segment_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/segment_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/semaphore_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/semaphore_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/semaphore_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/shear_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/shear_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/shear_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/signature_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/signature_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/signature_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/splay-tree_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/splay-tree_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/splay-tree_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/static_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/static_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/static_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/statistic_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/statistic_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/statistic_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/stream-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/stream-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/stream_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/stream_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/stream_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/string_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/string___8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/string___8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/structHuffmanTable.html
-share/doc/ImageMagick-7/www/api/MagickCore/structSemaphoreInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__AffineMatrix.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__Ascii85Info.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__BlobInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__CacheInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__CacheMethods.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__CacheView.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ChannelStatistics.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ChromaticityInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__Cluster.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__CoderInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ColorInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ColorPacket.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ConfigureInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ContributionInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__CubeInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__DIR.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__DataSegmentInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__DelegateInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__DiversityPacket.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__DoublePixelPacket.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__DrawInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__EdgeInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ElementInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ElementReference.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__EntryInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ErrorInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__EventInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ExceptionInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ExtentPacket.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__FrameInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__FxInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__GeometryInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__GhostscriptVectors.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__GradientInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__HandlerInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__HashmapInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__Image.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ImageAttribute.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ImageInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__IntervalTree.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__LinkedListInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__LocaleInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__LogInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__LongPixelPacket.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__MagicInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__MagickInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__MagickPixelPacket.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__MedianListNode.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__MedianPixelList.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__MedianSkipList.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__MemoryInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__MimeInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ModuleInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__MontageInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__NTMEMORYSTATUSEX.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__NexusInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__NodeInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__Nodes.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__OptionInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__PathInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__PixelPacket.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__PointInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__PolygonInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__PrimaryInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__PrimitiveInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ProfileInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__QuantizeInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__QuantumInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__QuantumState.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__RandomInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__RealPixelPacket.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__RectangleInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__RegistryInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ResampleFilter.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ResizeFilter.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ResourceInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__SegmentInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__SignatureInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__SplayTreeInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__StopInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__StreamInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__StringInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ThresholdMap.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__Timer.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__TimerInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__TokenInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__TypeInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__TypeMetric.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ViewInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__XImportInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__XMLTreeInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__XMLTreeRoot.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__XWidgetInfo.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ZeroCrossing.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__dirdesc.html
-share/doc/ImageMagick-7/www/api/MagickCore/struct__ile3.html
-share/doc/ImageMagick-7/www/api/MagickCore/structdirent.html
-share/doc/ImageMagick-7/www/api/MagickCore/studio_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/studio_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/tab_b.gif
-share/doc/ImageMagick-7/www/api/MagickCore/tab_l.gif
-share/doc/ImageMagick-7/www/api/MagickCore/tab_r.gif
-share/doc/ImageMagick-7/www/api/MagickCore/tabs.css
-share/doc/ImageMagick-7/www/api/MagickCore/threshold_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/threshold_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/threshold_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/timer_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/timer_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/timer_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/token_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/token_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/token_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/transform_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/transform_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/transform_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/tree.html
-share/doc/ImageMagick-7/www/api/MagickCore/type_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/type_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/type_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/utility_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/utility_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/utility_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/version_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/version_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/version_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/vms_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/vms_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/vms_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/widget_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/widget_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/widget_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/xml-tree_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/xml-tree_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/xml-tree_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/xwindow-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/xwindow-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickCore/xwindow_8c.html
-share/doc/ImageMagick-7/www/api/MagickCore/xwindow_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickCore/xwindow_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/MagickWand_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/MagickWand_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/animate_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/animate_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/animate_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/annotated.html
-share/doc/ImageMagick-7/www/api/MagickWand/classes.html
-share/doc/ImageMagick-7/www/api/MagickWand/compare_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/compare_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/compare_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/composite_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/composite_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/composite_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/conjure_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/conjure_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/conjure_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/convert_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/convert_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/convert_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/deprecate_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/deprecate_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/deprecate_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/dir_101f7ac0a894e32543a314e85b2e1524.html
-share/doc/ImageMagick-7/www/api/MagickWand/dirs.html
-share/doc/ImageMagick-7/www/api/MagickWand/display_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/display_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/display_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/doxygen.css
-share/doc/ImageMagick-7/www/api/MagickWand/doxygen.png
-share/doc/ImageMagick-7/www/api/MagickWand/drawing-wand_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/drawing-wand_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/drawing-wand_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/drawtest_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/files.html
-share/doc/ImageMagick-7/www/api/MagickWand/ftv2blank.png
-share/doc/ImageMagick-7/www/api/MagickWand/ftv2doc.png
-share/doc/ImageMagick-7/www/api/MagickWand/ftv2folderclosed.png
-share/doc/ImageMagick-7/www/api/MagickWand/ftv2folderopen.png
-share/doc/ImageMagick-7/www/api/MagickWand/ftv2lastnode.png
-share/doc/ImageMagick-7/www/api/MagickWand/ftv2link.png
-share/doc/ImageMagick-7/www/api/MagickWand/ftv2mlastnode.png
-share/doc/ImageMagick-7/www/api/MagickWand/ftv2mnode.png
-share/doc/ImageMagick-7/www/api/MagickWand/ftv2node.png
-share/doc/ImageMagick-7/www/api/MagickWand/ftv2plastnode.png
-share/doc/ImageMagick-7/www/api/MagickWand/ftv2pnode.png
-share/doc/ImageMagick-7/www/api/MagickWand/ftv2vertline.png
-share/doc/ImageMagick-7/www/api/MagickWand/functions.html
-share/doc/ImageMagick-7/www/api/MagickWand/functions_vars.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x61.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x62.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x63.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x64.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x65.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x67.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x69.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x6d.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x6e.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x6f.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x70.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x71.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x72.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x73.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x74.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x75.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x77.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_0x78.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_defs.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_enum.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_eval.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_func.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_func_0x63.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_func_0x64.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_func_0x67.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_func_0x69.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_func_0x6d.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_func_0x6e.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_func_0x70.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_func_0x72.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_func_0x73.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_type.html
-share/doc/ImageMagick-7/www/api/MagickWand/globals_vars.html
-share/doc/ImageMagick-7/www/api/MagickWand/identify_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/identify_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/identify_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/import_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/import_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/import_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/index.html
-share/doc/ImageMagick-7/www/api/MagickWand/magick-image_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/magick-image_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/magick-image_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/magick-property_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/magick-property_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/magick-property_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/magick-wand-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/magick-wand-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/magick-wand_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/magick-wand_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/magick-wand_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/magick__wand_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/magick__wand_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/main.html
-share/doc/ImageMagick-7/www/api/MagickWand/mogrify-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/mogrify-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/mogrify_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/mogrify_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/mogrify_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/montage_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/montage_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/montage_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/pixel-iterator_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/pixel-iterator_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/pixel-iterator_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/pixel-wand-private_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/pixel-wand-private_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/pixel-wand_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/pixel-wand_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/pixel-wand_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/stream_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/stream_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/stream_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/struct__CompositeOptions.html
-share/doc/ImageMagick-7/www/api/MagickWand/struct__DrawVTable.html
-share/doc/ImageMagick-7/www/api/MagickWand/struct__DrawingWand.html
-share/doc/ImageMagick-7/www/api/MagickWand/struct__MagickWand.html
-share/doc/ImageMagick-7/www/api/MagickWand/struct__PixelIterator.html
-share/doc/ImageMagick-7/www/api/MagickWand/struct__PixelWand.html
-share/doc/ImageMagick-7/www/api/MagickWand/studio_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/studio_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/tab_b.gif
-share/doc/ImageMagick-7/www/api/MagickWand/tab_l.gif
-share/doc/ImageMagick-7/www/api/MagickWand/tab_r.gif
-share/doc/ImageMagick-7/www/api/MagickWand/tabs.css
-share/doc/ImageMagick-7/www/api/MagickWand/tree.html
-share/doc/ImageMagick-7/www/api/MagickWand/wand_8c.html
-share/doc/ImageMagick-7/www/api/MagickWand/wand_8h-source.html
-share/doc/ImageMagick-7/www/api/MagickWand/wand_8h.html
-share/doc/ImageMagick-7/www/api/MagickWand/wandtest_8c.html
 share/doc/ImageMagick-7/www/api/animate.html
 share/doc/ImageMagick-7/www/api/annotate.html
 share/doc/ImageMagick-7/www/api/attribute.html
@ -1131,7 +421,6 @@ share/doc/ImageMagick-7/www/api/wand-view.html
 share/doc/ImageMagick-7/www/architecture.html
 share/doc/ImageMagick-7/www/assets/magick.css
 share/doc/ImageMagick-7/www/assets/magick.js
-share/doc/ImageMagick-7/www/binary-releases.html
 share/doc/ImageMagick-7/www/changelog.html
 share/doc/ImageMagick-7/www/cipher.html
 share/doc/ImageMagick-7/www/cite.html
@ -1183,6 +472,7 @@ share/doc/ImageMagick-7/www/mirror.html
 share/doc/ImageMagick-7/www/mogrify.html
 share/doc/ImageMagick-7/www/montage.html
 share/doc/ImageMagick-7/www/motion-picture.html
+share/doc/ImageMagick-7/www/news.html
 share/doc/ImageMagick-7/www/opencl.html
 share/doc/ImageMagick-7/www/openmp.html
 share/doc/ImageMagick-7/www/perl-magick.html
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.233 2020/09/20 08:39:06 wiz Exp $
+$NetBSD: distinfo,v 1.233.2.2 2020/12/11 10:00:20 bsiegert Exp $

-SHA1 (ImageMagick-7.0.10-30.tar.xz) = 659c54d28a34218c1fe740d7b9cd3837b8e9bce8
-RMD160 (ImageMagick-7.0.10-30.tar.xz) = 5405d64612f2e1a607ba2a8ffc8998443e666068
-SHA512 (ImageMagick-7.0.10-30.tar.xz) = 5e05e989c9752141c00e6329461aa1b8b11df7719473cded4ba47a0f7ee4d2e8f2c69f410fa3937920524cc0753863de796155badbce910b0a089c2af3be254d
-Size (ImageMagick-7.0.10-30.tar.xz) = 9653020 bytes
-SHA1 (patch-config_policy.xml) = 2c446a00fc00f85ab33eae0691d4d8989a46289f
+SHA1 (ImageMagick-7.0.10-41.tar.xz) = 168e7abe7e7af5dd010b598017da02623e477b23
+RMD160 (ImageMagick-7.0.10-41.tar.xz) = aa4c7edd32c254aee7c6477b1f9578d30e1912b9
+SHA512 (ImageMagick-7.0.10-41.tar.xz) = 62439bcc7a2447593bedf165c2c05e67e27d672823523d611439fa2dc288e948772389772dcf1f8633ca7dbf38b514cf5fc3bfb5fb3d61e2efdd38fe7a2ad040
+Size (ImageMagick-7.0.10-41.tar.xz) = 9645036 bytes
+SHA1 (patch-config_policy.xml) = 6f2719275159cafc447fee4ebd00cc3066fe3a57
--- a/graphics/ImageMagick/options.mk
+++ b/graphics/ImageMagick/options.mk
@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2020/09/01 12:21:03 ryoon Exp $
+# $NetBSD: options.mk,v 1.21.2.1 2020/11/24 18:28:37 bsiegert Exp $

 PKG_OPTIONS_VAR=		PKG_OPTIONS.ImageMagick
 PKG_SUPPORTED_OPTIONS=		x11 jp2 djvu openexr wmf liblqr heif
@ -52,7 +52,7 @@ CONFIGURE_ARGS+=	--without-wmf

 .if !empty(PKG_OPTIONS:Mheif)
 .include "../../graphics/libheif/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-heif
+CONFIGURE_ARGS+=	--with-heic
 .else
-CONFIGURE_ARGS+=	--without-heif
+CONFIGURE_ARGS+=	--without-heic
 .endif
--- a/graphics/ImageMagick/patches/patch-config_policy.xml
+++ b/graphics/ImageMagick/patches/patch-config_policy.xml
@ -1,14 +1,14 @@
-$NetBSD: patch-config_policy.xml,v 1.4 2020/06/08 10:23:18 tm Exp $
+$NetBSD: patch-config_policy.xml,v 1.4.4.2 2020/12/11 10:00:20 bsiegert Exp $

 Disable ghostscript coders by default to workaround VU#332928:
 <https://www.kb.cert.org/vuls/id/332928>

--- config/policy.xml.orig	2018-08-13 11:05:28.000000000 +0000
+--- config/policy.xml.orig	2020-11-14 14:52:59.000000000 +0000
 +++ config/policy.xml
-@@ -74,4 +74,16 @@
-   <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
+@@ -72,6 +72,18 @@
   <!-- <policy domain="cache" name="synchronize" value="True"/> -->
   <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
+   <!-- <policy domain="system" name="max-memory-request" value="256MiB"/> -->
 +
 +  <!-- 
 +    -- Disable ghostscript coders as suggested by VU#332928
@ -21,4 +21,6 @@ Disable ghostscript coders by default to workaround VU#332928:
 +  <policy domain="coder" rights="none" pattern="PDF" />
 +  <policy domain="coder" rights="none" pattern="XPS" />
 +
+   <!-- <policy domain="system" name="shred" value="2"/> -->
+   <!-- <policy domain="system" name="precision" value="6"/> -->
 </policymap>
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.120 2020/06/03 08:40:21 adam Exp $
+# $NetBSD: Makefile,v 1.120.4.1 2020/10/21 17:08:49 spz Exp $

-DISTNAME=	freetype-2.10.2
+DISTNAME=	freetype-2.10.4
 PKGNAME=	${DISTNAME:S/-/2-/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freetype/}
--- a/graphics/freetype2/PLIST
+++ b/graphics/freetype2/PLIST
@ -1,10 +1,13 @@
-@comment $NetBSD: PLIST,v 1.28 2019/04/02 07:17:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.28.12.1 2020/10/21 17:08:49 spz Exp $
 bin/freetype-config
 include/freetype2/freetype/config/ftconfig.h
 include/freetype2/freetype/config/ftheader.h
 include/freetype2/freetype/config/ftmodule.h
 include/freetype2/freetype/config/ftoption.h
 include/freetype2/freetype/config/ftstdlib.h
+include/freetype2/freetype/config/integer-types.h
+include/freetype2/freetype/config/mac-support.h
+include/freetype2/freetype/config/public-macros.h
 include/freetype2/freetype/freetype.h
 include/freetype2/freetype/ftadvanc.h
 include/freetype2/freetype/ftbbox.h
--- a/graphics/freetype2/distinfo
+++ b/graphics/freetype2/distinfo
@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.68 2020/06/03 08:40:21 adam Exp $
+$NetBSD: distinfo,v 1.68.4.1 2020/10/21 17:08:49 spz Exp $

-SHA1 (freetype-2.10.2.tar.xz) = b074d5c34dc0e3cc150be6e7aa6b07c9ec4ed875
-RMD160 (freetype-2.10.2.tar.xz) = 24422bafc6753ae0579a9deaf3ddde0abf3f31b7
-SHA512 (freetype-2.10.2.tar.xz) = cf45089bd8893d7de2cdcb59d91bbb300e13dd0f0a9ef80ed697464ba7aeaf46a5a81b82b59638e6b21691754d8f300f23e1f0d11683604541d77f0f581affaa
-Size (freetype-2.10.2.tar.xz) = 2404456 bytes
+SHA1 (freetype-2.10.4.tar.xz) = 0181862673f7216ad2b5074f95fc131209e30b27
+RMD160 (freetype-2.10.4.tar.xz) = daf8f00c3698b480c9beb8ce8059f30d98644c14
+SHA512 (freetype-2.10.4.tar.xz) = 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
+Size (freetype-2.10.4.tar.xz) = 2416620 bytes
 SHA1 (patch-builds_unix_freetype-config.in) = 60217b884a0f50c90f89529eaf909ded2693e3be
 SHA1 (patch-builds_unix_unix-cc.in) = 24f2842f3c6bab662d870917af3d77d663c50f77
--- a/graphics/openexr/buildlink3.mk
+++ b/graphics/openexr/buildlink3.mk
@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2020/05/21 20:58:32 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.15.4.1 2020/10/23 17:36:23 bsiegert Exp $

 BUILDLINK_TREE+=	openexr

@ -11,6 +11,9 @@ BUILDLINK_PKGSRCDIR.openexr?=	../../graphics/openexr

 PTHREAD_OPTS+=	require

+# C++14
+GCC_REQD+=	6
+
 .include "../../graphics/ilmbase/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # OPENEXR_BUILDLINK3_MK
--- a/lang/libunwind/Makefile
+++ b/lang/libunwind/Makefile
@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2019/12/29 15:31:23 adam Exp $
+# $NetBSD: Makefile,v 1.22.6.1 2020/10/29 08:00:30 bsiegert Exp $

 .include "../../lang/llvm/version.mk"

 DISTNAME=	libunwind-${LLVM_VERSION}.src
 PKGNAME=	${DISTNAME:S/.src//}
+PKGREVISION=	1
 CATEGORIES=	lang devel

 MAINTAINER=	pkgsrc-users@NetBSD.org
@ -31,6 +32,7 @@ post-extract:
 	${MKDIR} ${WRKDIR}/build

 post-install:
+	${RM} -f ${WRKSRC}/include/__libunwind_config.h.orig
 	cd ${WRKSRC}/include && ${PAX} -rw . ${DESTDIR}${PREFIX}/include

 BUILDLINK_DEPMETHOD.llvm=	build
--- a/lang/libunwind/distinfo
+++ b/lang/libunwind/distinfo
@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.18 2020/07/26 19:20:13 adam Exp $
+$NetBSD: distinfo,v 1.18.2.1 2020/10/29 08:00:30 bsiegert Exp $

 SHA1 (libunwind-10.0.1.src.tar.xz) = f5c9398aedd1a41c7667208abdabc9274b7a19ae
 RMD160 (libunwind-10.0.1.src.tar.xz) = 9602856d899cf8681c7baabbb17765fa07849093
 SHA512 (libunwind-10.0.1.src.tar.xz) = 8d717ba951ca25ca133a5d204cd7cca693402003a5a91cd2bc2bb0427486ccd37beac45aa54a6e7830c5358ecb64d1d674f7522e3192be7f9dba8384ad757f26
 Size (libunwind-10.0.1.src.tar.xz) = 92724 bytes
+SHA1 (patch-include_____libunwind__config.h) = b1727e79e7a00e4e5c412584dcfc357a696e2d6a
+SHA1 (patch-src_UnwindRegistersRestore.S) = bd8aa0754a87315efbe6cedcb81febcb32c8a020
+SHA1 (patch-src_UnwindRegistersSave.S) = 6c976325c8d871550d75fa51047e6a0b92f00f52
+SHA1 (patch-src_config.h) = c41a01427316ce7713a5b357a3a7a76a71ad8e6f
+SHA1 (patch-src_libunwind.cpp) = 6da6a2ac31364113e9b1f3e9377669dbc56cfa2a
--- a/lang/libunwind/patches/patch-include___libunwindconfig.h
+++ b/lang/libunwind/patches/patch-include___libunwindconfig.h
@ -0,0 +1,15 @@
+$NetBSD: patch-include_____libunwind__config.h,v 1.1.2.2 2020/10/29 08:00:30 bsiegert Exp $
+
+Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
+
+--- include/__libunwind_config.h.orig	2020-07-07 16:21:37.000000000 +0000
+++ include/__libunwind_config.h
+@@ -50,7 +50,7 @@
+ #  define _LIBUNWIND_CONTEXT_SIZE 167
+ #  define _LIBUNWIND_CURSOR_SIZE 179
+ #  define _LIBUNWIND_HIGHEST_DWARF_REGISTER _LIBUNWIND_HIGHEST_DWARF_REGISTER_PPC64
+-# elif defined(__ppc__)
+# elif defined(__ppc__) || defined(__powerpc__)
+ #  define _LIBUNWIND_TARGET_PPC 1
+ #  define _LIBUNWIND_CONTEXT_SIZE 117
+ #  define _LIBUNWIND_CURSOR_SIZE 124
--- a/lang/libunwind/patches/patch-src_UnwindRegistersRestore.S
+++ b/lang/libunwind/patches/patch-src_UnwindRegistersRestore.S
@ -0,0 +1,15 @@
+$NetBSD: patch-src_UnwindRegistersRestore.S,v 1.1.2.2 2020/10/29 08:00:30 bsiegert Exp $
+
+Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
+
+--- src/UnwindRegistersRestore.S.orig	2020-07-07 16:21:37.000000000 +0000
+++ src/UnwindRegistersRestore.S
+@@ -392,7 +392,7 @@ Lnovec:
+   PPC64_LR(3)
+   bctr
+ 
+-#elif defined(__ppc__)
+#elif defined(__ppc__) || defined(__powerpc__)
+ 
+ DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind13Registers_ppc6jumptoEv)
+ //
--- a/lang/libunwind/patches/patch-src_UnwindRegistersSave.S
+++ b/lang/libunwind/patches/patch-src_UnwindRegistersSave.S
@ -0,0 +1,15 @@
+$NetBSD: patch-src_UnwindRegistersSave.S,v 1.1.2.2 2020/10/29 08:00:30 bsiegert Exp $
+
+Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
+
+--- src/UnwindRegistersSave.S.orig	2020-07-07 16:21:37.000000000 +0000
+++ src/UnwindRegistersSave.S
+@@ -554,7 +554,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getconte
+   blr
+ 
+ 
+-#elif defined(__ppc__)
+#elif defined(__ppc__) || defined(__powerpc__)
+ 
+ //
+ // extern int unw_getcontext(unw_context_t* thread_state)
--- a/lang/libunwind/patches/patch-src_config.h
+++ b/lang/libunwind/patches/patch-src_config.h
@ -0,0 +1,15 @@
+$NetBSD: patch-src_config.h,v 1.1.2.2 2020/10/29 08:00:30 bsiegert Exp $
+
+Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
+
+--- src/config.h.orig	2020-07-07 16:21:37.000000000 +0000
+++ src/config.h
+@@ -95,7 +95,7 @@
+ #define _LIBUNWIND_BUILD_SJLJ_APIS
+ #endif
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__)
+#if defined(__i386__) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__powerpc__)
+ #define _LIBUNWIND_SUPPORT_FRAME_APIS
+ #endif
+ 
--- a/lang/libunwind/patches/patch-src_libunwind.cpp
+++ b/lang/libunwind/patches/patch-src_libunwind.cpp
@ -0,0 +1,15 @@
+$NetBSD: patch-src_libunwind.cpp,v 1.1.2.2 2020/10/29 08:00:30 bsiegert Exp $
+
+Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
+
+--- src/libunwind.cpp.orig	2020-07-07 16:21:37.000000000 +0000
+++ src/libunwind.cpp
+@@ -42,7 +42,7 @@ _LIBUNWIND_HIDDEN int __unw_init_local(u
+ # define REGISTER_KIND Registers_x86_64
+ #elif defined(__powerpc64__)
+ # define REGISTER_KIND Registers_ppc64
+-#elif defined(__ppc__)
+#elif defined(__ppc__) || defined(__powerpc__)
+ # define REGISTER_KIND Registers_ppc
+ #elif defined(__aarch64__)
+ # define REGISTER_KIND Registers_arm64
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.308 2020/09/04 15:01:04 taca Exp $
+# $NetBSD: phpversion.mk,v 1.308.2.3 2020/10/21 19:28:41 spz 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
-PHP72_VERSION=	7.2.33
-PHP73_VERSION=	7.3.22
-PHP74_VERSION=	7.4.10
+PHP72_VERSION=	7.2.34
+PHP73_VERSION=	7.3.23
+PHP74_VERSION=	7.4.11

 # Define initial release of major version.
 PHP56_RELDATE=	20140828
--- a/lang/php72/distinfo
+++ b/lang/php72/distinfo
@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.57 2020/08/08 13:32:57 taca Exp $
+$NetBSD: distinfo,v 1.57.2.1 2020/10/21 19:28:42 spz Exp $

-SHA1 (php-7.2.33.tar.xz) = 5297d7594af3950f395b775bbf7470c8e6f89683
-RMD160 (php-7.2.33.tar.xz) = 83b1f02ef406228ef3a3d1b0371246843d84c26e
-SHA512 (php-7.2.33.tar.xz) = 1c28e741fc6de88a33e1307bc88ba8dddf1ba767ce6eb9c1f0da35482c7d3ee1154831b997fa746340c4b7ec8de9196b21a9b1cf319c8e69eca2c92602ceee4a
-Size (php-7.2.33.tar.xz) = 12310624 bytes
+SHA1 (php-7.2.34.tar.xz) = 3dfe7bbed49e53f6ff76ca0b8c9162f78b1cc679
+RMD160 (php-7.2.34.tar.xz) = 52a993c201241e2dce521bad225f07330505b2cc
+SHA512 (php-7.2.34.tar.xz) = 7ecc3de3b5db41ec4ff6a5ce6c7e77dc330753c6f3fd87db4d07d6bb763a0b047e83afeef2251b4c6a5d2ff53fd9f3d7e99d091ef2e2c6ab8f18db7447d8a97d
+Size (php-7.2.34.tar.xz) = 12309432 bytes
 SHA1 (patch-configure) = 6e66a79e691a84aa7ae461f8dec1752443ad6b61
 SHA1 (patch-disable-filter-url) = e9e92d686ddd1d1a1ece10fe4feee4e368fe510c
 SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335
--- a/lang/php73/distinfo
+++ b/lang/php73/distinfo
@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2020/09/04 14:59:16 taca Exp $
+$NetBSD: distinfo,v 1.26.2.1 2020/10/21 19:13:41 spz Exp $

-SHA1 (php-7.3.22.tar.xz) = 4505a7579b6a35a060c5bcd6fc6c8bbf32d1603d
-RMD160 (php-7.3.22.tar.xz) = 837bcbaa9e894b05c15772ef885100bf7775611b
-SHA512 (php-7.3.22.tar.xz) = 7f06473e394e3236dff1376c8c9e6d15b998eef8b8b1148b103bd13dfd27785c01e1c6b15414ff64ea511f3f5e59e925831a7546f235d7c58bd47dcf46f6ff00
-Size (php-7.3.22.tar.xz) = 12134212 bytes
+SHA1 (php-7.3.23.tar.xz) = 4253311bcbe469d37644a8c2d793e40cd3e8ef95
+RMD160 (php-7.3.23.tar.xz) = 648b20df10e8934ff22cbeb6ea4ec60d5e55ad7a
+SHA512 (php-7.3.23.tar.xz) = b5e318bd59951b470a22b2ef2db19cd542d42bed72cf4abe4344c0521eeba606eac31a38ff49d2ab0cb7ed17441655e029d5984584d86b935f576515179777af
+Size (php-7.3.23.tar.xz) = 12133616 bytes
 SHA1 (patch-configure) = 08b80528ba90c705398e8841c232382663479a3b
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335
--- a/lang/php74/distinfo
+++ b/lang/php74/distinfo
@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2020/09/04 15:01:05 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2020/10/21 19:23:29 spz Exp $

-SHA1 (php-7.4.10.tar.xz) = d8c46de00a61eb7ef29e55e571bb6c525dd45f59
-RMD160 (php-7.4.10.tar.xz) = e48f95addc513d9cdb515d4e6d0d4728281eec1f
-SHA512 (php-7.4.10.tar.xz) = c7beb2d821f4e28b0444c8653c360d210a924e0638cc4b4ebc71bf2c22ef83caedfc880275329c3ffa644adc5858ccff59d35bf36255d57218774089d3376a21
-Size (php-7.4.10.tar.xz) = 10298480 bytes
+SHA1 (php-7.4.11.tar.xz) = 79e7bed05b2878e1f25d6a59dae0ea075645ffde
+RMD160 (php-7.4.11.tar.xz) = 85f9886e0cc6837d70b386306bf12602b9cd9637
+SHA512 (php-7.4.11.tar.xz) = 9bdd29a4a6c1ac55ed75d8fb2203ae5ef41992c518cb7e3b84cf74db62b03cfbe0ef4ea5614a684a37fcd2ae727376022ce49ed3ff32fc3a728e2f1e2474fb92
+Size (php-7.4.11.tar.xz) = 10302076 bytes
 SHA1 (patch-configure) = 5e9c9c06f6d819d5ba2832d648f41363f40f3108
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
--- a/lang/ruby/rails.mk
+++ b/lang/ruby/rails.mk
@ -1,4 +1,4 @@
-# $NetBSD: rails.mk,v 1.90 2020/09/10 16:53:03 taca Exp $
+# $NetBSD: rails.mk,v 1.90.2.1 2020/10/23 16:25:01 bsiegert Exp $

 .if !defined(_RUBY_RAILS_MK)
 _RUBY_RAILS_MK=	# defined
@ -48,7 +48,7 @@ _RUBY_RAILS_MK=	# defined
 # current Ruby on Rails versions.
 #
 RUBY_RAILS52_VERSION?=	5.2.4.4
-RUBY_RAILS60_VERSION?=	6.0.3.3
+RUBY_RAILS60_VERSION?=	6.0.3.4

 RUBY_RAILS_ACCEPTED?=	# defined
 RUBY_RAILS_DEFAULT?=	52
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.222 2020/05/21 15:57:59 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.222.4.1 2020/10/21 19:54:09 spz Exp $
 #

 # This file determines which Ruby version is used as a dependency for
@ -215,7 +215,7 @@ RUBY_VERSION_REQD?=	${PKGNAME_REQD:C/ruby([0-9][0-9])-.*/\1/}
 # current supported Ruby's version
 RUBY25_VERSION=		2.5.8
 RUBY26_VERSION=		2.6.6
-RUBY27_VERSION=		2.7.1
+RUBY27_VERSION=		2.7.2

 # current API compatible version; used for version of shared library
 RUBY25_API_VERSION=	2.5.0
@ -347,7 +347,7 @@ RUBY_ABI_VERSION=	${RUBY_VERSION}
 RUBY_RDOC_VERSION=	6.2.1

 RUBY_DID_YOU_MEAN_VERSION=	1.4.0
-RUBY_IRB_VERSION=		1.2.3
+RUBY_IRB_VERSION=		1.2.6

 # bundled gems
 RUBY_MINITEST_VERSION=		5.13.0
--- a/lang/ruby25-base/Makefile
+++ b/lang/ruby25-base/Makefile
@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2020/04/01 15:25:26 taca Exp $
+# $NetBSD: Makefile,v 1.16.4.1 2020/10/21 20:02:44 spz Exp $

 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}

--- a/lang/ruby25-base/distinfo
+++ b/lang/ruby25-base/distinfo
@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2020/04/01 15:25:26 taca Exp $
+$NetBSD: distinfo,v 1.13.4.1 2020/10/21 20:02:44 spz Exp $

 SHA1 (ruby-2.5.8.tar.xz) = d5ef8e8f28c098e6b7ea24924e0b0fee6e2f766c
 RMD160 (ruby-2.5.8.tar.xz) = 885ffaf5c394ff8779bbc4ee5e6cf0976aa3d6cf
@ -17,4 +17,5 @@ SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e35
 SHA1 (patch-lib_rubygems_installer.rb) = 7a9cfbd5d05c8901132d2bbf4555efa05e6363ec
 SHA1 (patch-lib_rubygems_platform.rb) = a208bf6bce28a687511bace5ff8a773fb6bcf87d
 SHA1 (patch-lib_rubygems_specification.rb) = e2ef2e6de4838168d11efef92f65d87d22c65ae4
+SHA1 (patch-lib_webrick_httprequest.rb) = 6e9eedbdceee3a1e6d8e5ec2f160ce8f705237ea
 SHA1 (patch-test_rubygems_test__gem.rb) = 80d646b95df81bacca6d277d2801dba16df291f5
--- a/lang/ruby25-base/patches/patch-lib_webrick_httprequest.rb
+++ b/lang/ruby25-base/patches/patch-lib_webrick_httprequest.rb
@ -0,0 +1,27 @@
+$NetBSD: patch-lib_webrick_httprequest.rb,v 1.1.2.2 2020/10/21 20:02:44 spz Exp $
+
+Add fix for CVE-2020-25613.
+
+--- lib/webrick/httprequest.rb.orig	2020-03-31 12:15:56.000000000 +0000
+++ lib/webrick/httprequest.rb
+@@ -226,9 +226,9 @@ module WEBrick
+         raise HTTPStatus::BadRequest, "bad URI `#{@unparsed_uri}'."
+       end
+ 
+-      if /close/io =~ self["connection"]
+      if /\Aclose\z/io =~ self["connection"]
+         @keep_alive = false
+-      elsif /keep-alive/io =~ self["connection"]
+      elsif /\Akeep-alive\z/io =~ self["connection"]
+         @keep_alive = true
+       elsif @http_version < "1.1"
+         @keep_alive = false
+@@ -475,7 +475,7 @@ module WEBrick
+       return unless socket
+       if tc = self['transfer-encoding']
+         case tc
+-        when /chunked/io then read_chunked(socket, block)
+        when /\Achunked\z/io then read_chunked(socket, block)
+         else raise HTTPStatus::NotImplemented, "Transfer-Encoding: #{tc}."
+         end
+       elsif self['content-length'] || @remaining_size
--- a/lang/ruby26-base/Makefile
+++ b/lang/ruby26-base/Makefile
@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2020/04/01 15:21:57 taca Exp $
+# $NetBSD: Makefile,v 1.10.4.1 2020/10/21 19:58:57 spz Exp $

 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}

--- a/lang/ruby26-base/distinfo
+++ b/lang/ruby26-base/distinfo
@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2020/04/01 15:21:57 taca Exp $
+$NetBSD: distinfo,v 1.8.4.1 2020/10/21 19:58:57 spz Exp $

 SHA1 (ruby-2.6.6.tar.xz) = 4dc8d4f7abc1d498b7bac68e82efc01a849f300f
 RMD160 (ruby-2.6.6.tar.xz) = 3091dc207ad5089305c105582e39f73ca9dfeb2b
@ -17,5 +17,6 @@ SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6
 SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3
 SHA1 (patch-lib_rubygems_installer.rb) = bce2fe5bcc88ba15352c1e3017bdf97e19d0cbfa
 SHA1 (patch-lib_rubygems_platform.rb) = 8608f9e29728101789a990d73b4a6780054dd278
+SHA1 (patch-lib_webrick_httprequest.rb) = 71d2d01e27d23aa5f0b7bc77f2cda1fd85aeeab4
 SHA1 (patch-test_rubygems_test__gem.rb) = 80d646b95df81bacca6d277d2801dba16df291f5
 SHA1 (patch-thread__pthread.c) = ce3dfbc7e953cdd04522bcc8e443b60e541845ce
--- a/lang/ruby26-base/patches/patch-lib_webrick_httprequest.rb
+++ b/lang/ruby26-base/patches/patch-lib_webrick_httprequest.rb
@ -0,0 +1,27 @@
+$NetBSD: patch-lib_webrick_httprequest.rb,v 1.1.2.2 2020/10/21 19:58:57 spz Exp $
+
+Add fix for CVE-2020-25613.
+
+--- lib/webrick/httprequest.rb.orig	2020-03-31 11:23:13.000000000 +0000
+++ lib/webrick/httprequest.rb
+@@ -226,9 +226,9 @@ module WEBrick
+         raise HTTPStatus::BadRequest, "bad URI `#{@unparsed_uri}'."
+       end
+ 
+-      if /close/io =~ self["connection"]
+      if /\Aclose\z/io =~ self["connection"]
+         @keep_alive = false
+-      elsif /keep-alive/io =~ self["connection"]
+      elsif /\Akeep-alive\z/io =~ self["connection"]
+         @keep_alive = true
+       elsif @http_version < "1.1"
+         @keep_alive = false
+@@ -503,7 +503,7 @@ module WEBrick
+       return unless socket
+       if tc = self['transfer-encoding']
+         case tc
+-        when /chunked/io then read_chunked(socket, block)
+        when /\Achunked\z/io then read_chunked(socket, block)
+         else raise HTTPStatus::NotImplemented, "Transfer-Encoding: #{tc}."
+         end
+       elsif self['content-length'] || @remaining_size
--- a/lang/ruby27-base/Makefile
+++ b/lang/ruby27-base/Makefile
@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2020/06/19 09:21:06 taca Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2020/10/21 19:54:09 spz Exp $

 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}

--- a/lang/ruby27-base/PLIST
+++ b/lang/ruby27-base/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/04/01 15:23:14 taca Exp $
+@comment $NetBSD: PLIST,v 1.2.4.1 2020/10/21 19:54:09 spz Exp $
 bin/bundle${RUBY_SUFFIX}
 bin/bundler${RUBY_SUFFIX}
 bin/erb${RUBY_SUFFIX}
@ -362,6 +362,7 @@ ${RUBY_LIB}/irb.rb
 ${RUBY_LIB}/irb/cmd/chws.rb
 ${RUBY_LIB}/irb/cmd/fork.rb
 ${RUBY_LIB}/irb/cmd/help.rb
+${RUBY_LIB}/irb/cmd/info.rb
 ${RUBY_LIB}/irb/cmd/load.rb
 ${RUBY_LIB}/irb/cmd/nop.rb
 ${RUBY_LIB}/irb/cmd/pushws.rb
@ -1494,7 +1495,7 @@ ${GEM_HOME}/specifications/default/psych-${RUBY_PSYCH_VERSION}.gemspec
 ${GEM_HOME}/specifications/default/racc-${RUBY_RACC_VERSION}.gemspec
 ${GEM_HOME}/specifications/default/rdoc-${RUBY_RDOC_VERSION}.gemspec
 ${GEM_HOME}/specifications/default/readline-0.0.2.gemspec
-${GEM_HOME}/specifications/default/reline-0.1.3.gemspec
+${GEM_HOME}/specifications/default/reline-0.1.5.gemspec
 ${GEM_HOME}/specifications/default/rexml-${RUBY_REXML_VERSION}.gemspec
 ${GEM_HOME}/specifications/default/rss-${RUBY_RSS_VERSION}.gemspec
 ${GEM_HOME}/specifications/default/sdbm-${RUBY_SDBM_VERSION}.gemspec
--- a/lang/ruby27-base/distinfo
+++ b/lang/ruby27-base/distinfo
@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2020/04/01 15:23:14 taca Exp $
+$NetBSD: distinfo,v 1.2.4.1 2020/10/21 19:54:09 spz Exp $

-SHA1 (ruby-2.7.1.tar.xz) = 6c92300d7fd3e9cbb433e5e687535dc5300848eb
-RMD160 (ruby-2.7.1.tar.xz) = 081f97d77d04e41df6ec5f28da1be1bcd32c053b
-SHA512 (ruby-2.7.1.tar.xz) = 79f98b1ea98e0b10ec79da1883e8fc84d48ffe5c09ae945cbebde94365e35a589d919aac965f74d70ca7e21370ecee631ac5a8f9c4eac61d62f5aa629f27bf31
-Size (ruby-2.7.1.tar.xz) = 12003684 bytes
+SHA1 (ruby-2.7.2.tar.xz) = 82a1fe683460caa8edb6199707f2905634e5ffcc
+RMD160 (ruby-2.7.2.tar.xz) = fa7fc107e0c2085bf997d7e4ec78ae5636c6bfe2
+SHA512 (ruby-2.7.2.tar.xz) = 7972278b096aa768c7adf2befd26003e18781a29ca317640317d30d93d6e963ded197724c8e2f1dfe1e838c5647176d414a74732a62e931fb50d6f2e0f777349
+Size (ruby-2.7.2.tar.xz) = 12037052 bytes
 SHA1 (patch-configure) = fd465910fe2cb6d6b1530e1071062591e84a9fd9
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-lib_mkmf.rb) = 4a3cd18548dbdf43a13695d4e76f817c0347e335
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.195 2020/09/25 12:21:02 gdt Exp $
+# $NetBSD: Makefile,v 1.195.2.2 2020/10/29 07:51:08 bsiegert Exp $

 DISTNAME=	rustc-1.45.2-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
@ -525,10 +525,16 @@ stage0-bootstrap: install
 # \todo Explain why this is limited to a small list of architectures,
 # and in particular why not x86_64.
 DEPENDS+=	compat80>=0:../../emulators/compat80
+.endif
+
+.if (${OPSYS} == "NetBSD") && \
+		((${MACHINE_ARCH} == "i386")) \
+	&& (empty(OS_VERSION:M[012345678].*) || \
+	    !empty(OS_VERSION:M8.99.*))
 # Bootstrap kits use openssl, which on NetBSD 8 comes from pkgsrc.
 # Therefore the pkgsrc openssl libs need to be present as well.
-# (Observed on i386, and presumed true on the other
-# bootstrap-built-for-8 systems.)  Then, when the package is built,
+# The 1.44.1 i686 bootstrap links with pkgsrc openssl.  The others do
+# not.  When the package is built,
 # cargo links against pkgsrc openssl, so it must be a run-time
 # dependency as well.  Forcing USE_BUILTIN.openssl=no results in a
 # mysterious heimdal error, but straight DEPENDS seems to result in a
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2020/08/31 18:09:58 wiz Exp $
+# $NetBSD: Makefile,v 1.63.2.1 2020/12/11 08:50:44 bsiegert Exp $

-DISTNAME=		neomutt-20200821
-PKGREVISION=		2
+DISTNAME=		neomutt-20201120
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=		${PKGVERSION_NOREV}
--- a/mail/neomutt/PLIST
+++ b/mail/neomutt/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2020/06/22 06:08:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21.4.1 2020/12/11 08:50:44 bsiegert Exp $
 bin/neomutt
 libexec/neomutt/pgpewrap
 ${PLIST.smime}libexec/neomutt/smime_keys
@ -8,11 +8,14 @@ man/man1/smime_keys_neomutt.1
 man/man5/mbox_neomutt.5
 man/man5/mmdf_neomutt.5
 man/man5/neomuttrc.5
+share/doc/neomutt/AUTHORS.md
 share/doc/neomutt/CODE_OF_CONDUCT.md
+share/doc/neomutt/CONTRIBUTING.md
 share/doc/neomutt/ChangeLog.md
 share/doc/neomutt/INSTALL.md
 share/doc/neomutt/LICENSE.md
 share/doc/neomutt/README.md
+share/doc/neomutt/SECURITY.md
 share/doc/neomutt/advancedusage.html
 share/doc/neomutt/colorschemes/neonwolf-256.neomuttrc
 share/doc/neomutt/colorschemes/solarized-dark-256.neomuttrc
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.46 2020/08/21 14:53:28 wiz Exp $
+$NetBSD: distinfo,v 1.46.2.1 2020/12/11 08:50:44 bsiegert Exp $

-SHA1 (neomutt-20200821-20200821.tar.gz) = 46dc66a15ae698b97fbcce1cff45c273b1a55b31
-RMD160 (neomutt-20200821-20200821.tar.gz) = bfc1aa8400df33bd2278aba7f54e0f3b449518ea
-SHA512 (neomutt-20200821-20200821.tar.gz) = f7cba9123613c34711b84ab9f5ccab840be38876da20b29d281c142a3b4f5d582b879d727c95232b0fcc7b41947d05bf89707232d3980e160bcdba68784d6eef
-Size (neomutt-20200821-20200821.tar.gz) = 3404856 bytes
+SHA1 (neomutt-20201120-20201120.tar.gz) = 368b18d398493705fec5ca55436f4929f4b31dc1
+RMD160 (neomutt-20201120-20201120.tar.gz) = 133beffc2887dd851104a59add8cbf0d3f3500e4
+SHA512 (neomutt-20201120-20201120.tar.gz) = 31c0cbfdf2b772f61b4c9bce97c9a2ad9fffb6ae21e562522544ad94247dfaa530334d90bd550eae1efc2b94a467ed959e4abb79b14261da7092f146a2e08e11
+Size (neomutt-20201120-20201120.tar.gz) = 3456322 bytes
 SHA1 (patch-resize.c) = b747f878459950462d56e01bada2d01b49fca088
--- a/mail/ruby-actionmailbox60/distinfo
+++ b/mail/ruby-actionmailbox60/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/09/10 14:30:03 taca Exp $
+$NetBSD: distinfo,v 1.5.2.1 2020/10/23 16:25:01 bsiegert Exp $

-SHA1 (actionmailbox-6.0.3.3.gem) = fa84ead6387625f4bbb273a0f21c477a66cb85ec
-RMD160 (actionmailbox-6.0.3.3.gem) = fce55137913721c234e7fe152f91e582ec0819a6
-SHA512 (actionmailbox-6.0.3.3.gem) = 3f48dc0cbc735bf19d01f2e56d09f7bf560c9575c6f65a2ad5d3d74a32e782657d7e3c4a0c8178f9c4a6249a265e79a34e222391c137153dccf50a9c2d13a919
-Size (actionmailbox-6.0.3.3.gem) = 20992 bytes
+SHA1 (actionmailbox-6.0.3.4.gem) = c96926a293abcb63a9471e9064824160b7348683
+RMD160 (actionmailbox-6.0.3.4.gem) = 0fee716e9b1e75769e51db1b47d8f7d3e1a3298a
+SHA512 (actionmailbox-6.0.3.4.gem) = 02bfe6af737d4cbc4a059a365896798267d791a274f15af196d14c1456faf15547762908edb87dde0fa5f42fbf7aedd29ad1aa00643dd1499c401291b798b78a
+Size (actionmailbox-6.0.3.4.gem) = 20992 bytes
--- a/mail/ruby-actionmailer60/distinfo
+++ b/mail/ruby-actionmailer60/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/09/10 14:30:02 taca Exp $
+$NetBSD: distinfo,v 1.5.2.1 2020/10/23 16:25:01 bsiegert Exp $

-SHA1 (actionmailer-6.0.3.3.gem) = 5ec626522e33b09577b60606c9ce38366a55fcf3
-RMD160 (actionmailer-6.0.3.3.gem) = aafbe2e12b1650656d3a442585e53227dd76908d
-SHA512 (actionmailer-6.0.3.3.gem) = efe4dbe4fc7066318835a882398d13d7169925a427b5ace1cb283d952ae6903d3b5f6b2bcaae9b20fa9cde86350c76f483f93cc99e32ff545835daef9b5f520c
-Size (actionmailer-6.0.3.3.gem) = 30720 bytes
+SHA1 (actionmailer-6.0.3.4.gem) = e2a0221f78f260b93ac57c1d40f2c0cabe82b1c9
+RMD160 (actionmailer-6.0.3.4.gem) = 521efcb8c0a10664d14d98ad76afe0505ee5b604
+SHA512 (actionmailer-6.0.3.4.gem) = c433ba7b0a1bdc93eca47596770c09ee7c716dbe3295b20166701d72ccf26c8fc443a9894205f242ef08db6c8e9a5c7d1e234a86a0c5fef476185ad57d9d96e5
+Size (actionmailer-6.0.3.4.gem) = 30720 bytes
--- a/misc/tmux/Makefile
+++ b/misc/tmux/Makefile
@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2020/06/13 21:42:43 leot Exp $
+# $NetBSD: Makefile,v 1.54.4.1 2020/11/01 10:16:22 bsiegert Exp $

-DISTNAME=	tmux-3.1b
+DISTNAME=	tmux-3.1c
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tmux/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}
--- a/misc/tmux/distinfo
+++ b/misc/tmux/distinfo
@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.47 2020/07/17 13:21:46 hauke Exp $
+$NetBSD: distinfo,v 1.47.2.1 2020/11/01 10:16:22 bsiegert Exp $

-SHA1 (tmux-3.1b.tar.gz) = 52ab7bbc8f5c48955b170f2473f9515cc31653b5
-RMD160 (tmux-3.1b.tar.gz) = 10bd0c871da3fd9c450408c96bbc7231257e40e4
-SHA512 (tmux-3.1b.tar.gz) = fd5269f5f58ad20c35ece24af74035e622e16511baa331717bded5edcbfd46c1847fd86c02431a7d889ce7d5bec89c8177a680ca60e9ca821f13065d26ca7fa1
-Size (tmux-3.1b.tar.gz) = 561152 bytes
+SHA1 (tmux-3.1c.tar.gz) = 7cf2736fd9c1cc9daf614679e4084d2746a15390
+RMD160 (tmux-3.1c.tar.gz) = 3c1ab6dcb1120129f66a6639214126565a7388e8
+SHA512 (tmux-3.1c.tar.gz) = aad2e6457dd350369f245f711f1936a575d0588b72e660d10e7abc7d373da0d322903b451ad00b96a3e0e6847ca855673da6a4c5447cea91fa756edd23659397
+Size (tmux-3.1c.tar.gz) = 561323 bytes
 SHA1 (patch-compat_daemon-darwin.c) = e8feeb4b100e73ab197eb2fd776fa648a1da28e4
 SHA1 (patch-osdep-darwin.c) = 4bcb0705e3ffa87df614e0946121b0ae66ad3f53
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.109 2020/09/19 14:00:54 taca Exp $
+# $NetBSD: Makefile,v 1.109.2.1 2020/11/01 10:50:52 bsiegert Exp $

-DISTNAME=	samba-4.12.7
+DISTNAME=	samba-4.12.9
 CATEGORIES=	net
 MASTER_SITES=	https://download.samba.org/pub/samba/stable/

--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.52 2020/09/19 14:00:54 taca Exp $
+$NetBSD: distinfo,v 1.52.2.1 2020/11/01 10:50:52 bsiegert Exp $

-SHA1 (samba-4.12.7.tar.gz) = b56b8390064572dd2024b23ca931fc82678ead2d
-RMD160 (samba-4.12.7.tar.gz) = 6947298acc9871f6c3245b1966b18ad490625c3e
-SHA512 (samba-4.12.7.tar.gz) = 5afb1f24b029e665bb4f6bd7b7cf915243476b09b304942b2105586fa99adc6a19b46b4753ca116e230e5bb7b82e011fbe296c62bc70a8a897e56aece55a7f0b
-Size (samba-4.12.7.tar.gz) = 18230157 bytes
+SHA1 (samba-4.12.9.tar.gz) = ec12a1e9577b70e1d1239e88ae54b2625885cf9f
+RMD160 (samba-4.12.9.tar.gz) = a34871667c3dd51b9c8866ffb0a677de90a10196
+SHA512 (samba-4.12.9.tar.gz) = 8bd3122bcaab2f5a16a73902a9b628384063a8116a08f0254541e05c148016839b3215c60ff0d3291a332e7884708950ad64137204b0ac19801012d3b6684fa6
+Size (samba-4.12.9.tar.gz) = 18236198 bytes
 SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = d927db17124d2bb5b382885e70a41f84c3929926
 SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
 SHA1 (patch-buildtools_wafsamba_samba__pidl.py) = e4c0ed3dacfcf5613a5b397b3c6cf88509497da7
--- a/net/youtube-dl/Makefile
+++ b/net/youtube-dl/Makefile
@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.214 2020/09/20 09:12:28 leot Exp $
+# $NetBSD: Makefile,v 1.214.2.1 2020/11/24 17:16:33 bsiegert Exp $

 # XXX: VERSION_DATE can contains also an optional part that indicates
 # XXX: possible same day revisions. PKGNAME preserves that dotted part as is.
-VERSION_DATE=	2020.09.20
+VERSION_DATE=	2020.11.12
 DISTNAME=	youtube-dl-${VERSION_DATE}
 PKGNAME=	${DISTNAME:S/.//:S/.//}
 CATEGORIES=	net
--- a/net/youtube-dl/distinfo
+++ b/net/youtube-dl/distinfo
@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.196 2020/09/20 09:12:28 leot Exp $
+$NetBSD: distinfo,v 1.196.2.1 2020/11/24 17:16:33 bsiegert Exp $

-SHA1 (youtube-dl-2020.09.20.tar.gz) = 2902fa18c30cc3851d5b7fc2932f3f986432b9ac
-RMD160 (youtube-dl-2020.09.20.tar.gz) = 107732952ec9238057a1bfc3fd7147ce4026f451
-SHA512 (youtube-dl-2020.09.20.tar.gz) = ed511016d0cfcbbee0cd651f793cb31cdb46d80243f86186de1cc54cb2a2055fae2f5cc3e16f838fc2ba47f3ff6f3b484219c8a707904fbc30193a2b28a1e30c
-Size (youtube-dl-2020.09.20.tar.gz) = 3188480 bytes
+SHA1 (youtube-dl-2020.11.12.tar.gz) = 04e72d0b0a0e85b79a6c2ac93b7c85254b95b53b
+RMD160 (youtube-dl-2020.11.12.tar.gz) = 2afd73b5c09463951086b29298489f0d203a2207
+SHA512 (youtube-dl-2020.11.12.tar.gz) = 7db373f6cc252635a3613ffe0b3b10640e262778105ebbd78b837fe019b0a2609032d2aeb81b239e000a86220aff99d2c018a9a6325adad6981a8ab64048131c
+Size (youtube-dl-2020.11.12.tar.gz) = 3188015 bytes
 SHA1 (patch-setup.py) = a67074ae7cfe5e77847c2f610337ea553eddb69b
+SHA1 (patch-youtube__dl_extractor_bandcamp.py) = 81855a3f4f8c03f61fe543eb339c0e67bf52682e
 SHA1 (patch-youtube__dl_extractor_la7.py) = e246750808305343227060acdc5a38583ef071e9
 SHA1 (patch-youtube__dl_extractor_rai.py) = 3dbad7852b38e7364a248a5c9851c50cd2ff9b38
 SHA1 (patch-youtube__dl_postprocessor_ffmpeg.py) = f96676170a448d9205d542a7def4beca615a1490
--- a/net/youtube-dl/patches/patch-youtube__dl_extractor_bandcamp.py
+++ b/net/youtube-dl/patches/patch-youtube__dl_extractor_bandcamp.py
@ -0,0 +1,223 @@
+$NetBSD: patch-youtube__dl_extractor_bandcamp.py,v 1.2.2.2 2020/11/24 17:16:33 bsiegert Exp $
+
+[bandcamp] Update to handle HTML quoted data
+
+Adjust the extractor to handle JSON data-* attributes by introducing a
+_json_data_extract() method to handle them (and existing existing
+patterns in the code).
+
+Based on Gilles Pietri #26684.
+
+--- youtube_dl/extractor/bandcamp.py.orig	2020-09-20 05:29:46.000000000 +0000
+++ youtube_dl/extractor/bandcamp.py
+@@ -35,12 +35,15 @@ class BandcampIE(InfoExtractor):
+             'ext': 'mp3',
+             'title': "youtube-dl  \"'/\\\u00e4\u21ad - youtube-dl test song \"'/\\\u00e4\u21ad",
+             'duration': 9.8485,
+            'uploader': "youtube-dl  \"'/\\\u00e4\u21ad",
+            'timestamp': 1354224127,
+            'upload_date': '20121129',
+         },
+         '_skip': 'There is a limit of 200 free downloads / month for the test song'
+     }, {
+         # free download
+         'url': 'http://benprunty.bandcamp.com/track/lanius-battle',
+-        'md5': '853e35bf34aa1d6fe2615ae612564b36',
+        'md5': '149170678c0a81a009c69566bf42920a',
+         'info_dict': {
+             'id': '2650410135',
+             'ext': 'aiff',
+@@ -79,6 +82,14 @@ class BandcampIE(InfoExtractor):
+         },
+     }]
+ 
+    def _json_data_extract(self, data_key, video_id, webpage):
+        return self._parse_json(
+            self._search_regex(
+                r'data-' + data_key + r'=(["\'])(?P<data>{.+?})\1',
+                webpage, 'JSON data {data_key}'.format(data_key=data_key),
+                group='data', default=None),
+            video_id, transform_source=unescapeHTML)
+
+     def _real_extract(self, url):
+         mobj = re.match(self._VALID_URL, url)
+         title = mobj.group('title')
+@@ -91,10 +102,9 @@ class BandcampIE(InfoExtractor):
+         duration = None
+ 
+         formats = []
+-        track_info = self._parse_json(
+-            self._search_regex(
+-                r'trackinfo\s*:\s*\[\s*({.+?})\s*\]\s*,\s*?\n',
+-                webpage, 'track info', default='{}'), title)
+        tralbum_data = self._json_data_extract('tralbum', title, webpage)
+        embed_data = self._json_data_extract('embed', title, webpage)
+        track_info = tralbum_data['trackinfo'][0]
+         if track_info:
+             file_ = track_info.get('file')
+             if isinstance(file_, dict):
+@@ -110,38 +120,28 @@ class BandcampIE(InfoExtractor):
+                         'acodec': ext,
+                         'abr': int_or_none(abr_str),
+                     })
+-            track = track_info.get('title')
+             track_id = str_or_none(track_info.get('track_id') or track_info.get('id'))
+             track_number = int_or_none(track_info.get('track_num'))
+             duration = float_or_none(track_info.get('duration'))
+ 
+         def extract(key):
+-            return self._search_regex(
+-                r'\b%s\s*["\']?\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1' % key,
+-                webpage, key, default=None, group='value')
+            for data in tralbum_data['current'], embed_data, tralbum_data:
+                if key in data and data[key]:
+                    return data[key]
+ 
+         artist = extract('artist')
+        track = extract('title')
+         album = extract('album_title')
+         timestamp = unified_timestamp(
+             extract('publish_date') or extract('album_publish_date'))
+         release_date = unified_strdate(extract('album_release_date'))
+ 
+-        download_link = self._search_regex(
+-            r'freeDownloadPage\s*:\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
+-            'download link', default=None, group='url')
+        download_link = tralbum_data['freeDownloadPage']
+         if download_link:
+-            track_id = self._search_regex(
+-                r'(?ms)var TralbumData = .*?[{,]\s*id: (?P<id>\d+),?$',
+-                webpage, 'track id')
+-
+             download_webpage = self._download_webpage(
+                 download_link, track_id, 'Downloading free downloads page')
+ 
+-            blob = self._parse_json(
+-                self._search_regex(
+-                    r'data-blob=(["\'])(?P<blob>{.+?})\1', download_webpage,
+-                    'blob', group='blob'),
+-                track_id, transform_source=unescapeHTML)
+            blob = self._json_data_extract('blob', track_id, download_webpage)
+ 
+             info = try_get(
+                 blob, (lambda x: x['digital_items'][0],
+@@ -218,7 +218,7 @@ class BandcampIE(InfoExtractor):
+         }
+ 
+ 
+-class BandcampAlbumIE(InfoExtractor):
+class BandcampAlbumIE(BandcampIE):
+     IE_NAME = 'Bandcamp:album'
+     _VALID_URL = r'https?://(?:(?P<subdomain>[^.]+)\.)?bandcamp\.com(?:/album/(?P<album_id>[^/?#&]+))?'
+ 
+@@ -299,26 +299,23 @@ class BandcampAlbumIE(InfoExtractor):
+         album_id = mobj.group('album_id')
+         playlist_id = album_id or uploader_id
+         webpage = self._download_webpage(url, playlist_id)
+-        track_elements = re.findall(
+-            r'(?s)<div[^>]*>(.*?<a[^>]+href="([^"]+?)"[^>]+itemprop="url"[^>]*>.*?)</div>', webpage)
+
+        tralbum_data = self._json_data_extract('tralbum', album_id, webpage)
+        embed_data = self._json_data_extract('embed', album_id, webpage)
+        title = embed_data.get('album_title')
+
+        track_elements = tralbum_data['trackinfo']
+         if not track_elements:
+             raise ExtractorError('The page doesn\'t contain any tracks')
+         # Only tracks with duration info have songs
+         entries = [
+             self.url_result(
+-                compat_urlparse.urljoin(url, t_path),
+                compat_urlparse.urljoin(url, t['title_link']),
+                 ie=BandcampIE.ie_key(),
+-                video_title=self._search_regex(
+-                    r'<span\b[^>]+\bitemprop=["\']name["\'][^>]*>([^<]+)',
+-                    elem_content, 'track title', fatal=False))
+-            for elem_content, t_path in track_elements
+-            if self._html_search_meta('duration', elem_content, default=None)]
+-
+-        title = self._html_search_regex(
+-            r'album_title\s*:\s*"((?:\\.|[^"\\])+?)"',
+-            webpage, 'title', fatal=False)
+-        if title:
+-            title = title.replace(r'\"', '"')
+                video_title=t['title'])
+            for t in track_elements
+            if t['duration']]
+
+         return {
+             '_type': 'playlist',
+             'uploader_id': uploader_id,
+@@ -328,22 +325,21 @@ class BandcampAlbumIE(InfoExtractor):
+         }
+ 
+ 
+-class BandcampWeeklyIE(InfoExtractor):
+class BandcampWeeklyIE(BandcampIE):
+     IE_NAME = 'Bandcamp:weekly'
+     _VALID_URL = r'https?://(?:www\.)?bandcamp\.com/?\?(?:.*?&)?show=(?P<id>\d+)'
+     _TESTS = [{
+         'url': 'https://bandcamp.com/?show=224',
+-        'md5': 'b00df799c733cf7e0c567ed187dea0fd',
+        'md5': '61acc9a002bed93986b91168aa3ab433',
+         'info_dict': {
+             'id': '224',
+-            'ext': 'opus',
+            'ext': 'mp3',
+             'title': 'BC Weekly April 4th 2017 - Magic Moments',
+             'description': 'md5:5d48150916e8e02d030623a48512c874',
+             'duration': 5829.77,
+             'release_date': '20170404',
+             'series': 'Bandcamp Weekly',
+             'episode': 'Magic Moments',
+-            'episode_number': 208,
+             'episode_id': '224',
+         }
+     }, {
+@@ -355,13 +351,13 @@ class BandcampWeeklyIE(InfoExtractor):
+         video_id = self._match_id(url)
+         webpage = self._download_webpage(url, video_id)
+ 
+-        blob = self._parse_json(
+-            self._search_regex(
+-                r'data-blob=(["\'])(?P<blob>{.+?})\1', webpage,
+-                'blob', group='blob'),
+-            video_id, transform_source=unescapeHTML)
+        blob = self._json_data_extract('blob', video_id, webpage)
+ 
+-        show = blob['bcw_show']
+        show = None
+        for bd in blob['bcw_data']:
+            if blob['bcw_data'][bd].get('expanded'):
+                show = blob['bcw_data'][bd]
+                break
+ 
+         # This is desired because any invalid show id redirects to `bandcamp.com`
+         # which happens to expose the latest Bandcamp Weekly episode.
+@@ -390,18 +386,6 @@ class BandcampWeeklyIE(InfoExtractor):
+         if subtitle:
+             title += ' - %s' % subtitle
+ 
+-        episode_number = None
+-        seq = blob.get('bcw_seq')
+-
+-        if seq and isinstance(seq, list):
+-            try:
+-                episode_number = next(
+-                    int_or_none(e.get('episode_number'))
+-                    for e in seq
+-                    if isinstance(e, dict) and int_or_none(e.get('id')) == show_id)
+-            except StopIteration:
+-                pass
+-
+         return {
+             'id': video_id,
+             'title': title,
+@@ -411,7 +395,6 @@ class BandcampWeeklyIE(InfoExtractor):
+             'release_date': unified_strdate(show.get('published_date')),
+             'series': 'Bandcamp Weekly',
+             'episode': show.get('subtitle'),
+-            'episode_number': episode_number,
+             'episode_id': compat_str(video_id),
+             'formats': formats
+         }
--- a/net/youtube-dl/patches/patch-youtube__dl_extractor_youtube.py
+++ b/net/youtube-dl/patches/patch-youtube__dl_extractor_youtube.py
@ -0,0 +1,19 @@
+$NetBSD: patch-youtube__dl_extractor_youtube.py,v 1.2.2.2 2020/11/24 17:16:33 bsiegert Exp $
+
+Update JS player URL to current one.
+
+Via:
+
+ https://github.com/blackjack4494/yt-dlc/pull/35
+
+--- youtube_dl/extractor/youtube.py.orig	2020-09-20 05:29:46.000000000 +0000
+++ youtube_dl/extractor/youtube.py
+@@ -2086,7 +2086,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor
+ 
+                 if cipher:
+                     if 's' in url_data or self._downloader.params.get('youtube_include_dash_manifest', True):
+-                        ASSETS_RE = r'"assets":.+?"js":\s*("[^"]+")'
+                        ASSETS_RE = r'(?:"assets":.+?"js":\s*("[^"]+"))|(?:"jsUrl":\s*("[^"]+"))'
+                         jsplayer_url_json = self._search_regex(
+                             ASSETS_RE,
+                             embed_webpage if age_gate else video_webpage,
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.202 2019/11/25 09:50:55 wiz Exp $
+# $NetBSD: Makefile,v 1.202.8.1 2020/10/21 17:08:59 spz Exp $
 #
 # NOTE:	If you update this package, then you'll likely need to also update
 #	the x11-links dependency in buildlink3.mk to the correct version,
 #	usually the most recent.

-PKGNAME=	x11-links-1.31
+PKGNAME=	x11-links-1.32
 CATEGORIES=	pkgtools x11

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.93 2019/11/25 09:50:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.93.8.1 2020/10/21 17:08:59 spz Exp $
 #
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
@ -12,7 +12,7 @@ BUILDLINK_TREE+=	x11-links
 .if !defined(X11_LINKS_BUILDLINK3_MK)
 X11_LINKS_BUILDLINK3_MK:=

-BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=1.31
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=1.32
 BUILDLINK_PKGSRCDIR.x11-links?=		../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=		build

--- a/pkgtools/x11-links/files/xorg.freetype2
+++ b/pkgtools/x11-links/files/xorg.freetype2
@ -1,4 +1,4 @@
-# $NetBSD: xorg.freetype2,v 1.27 2019/07/21 21:30:14 rjs Exp $
+# $NetBSD: xorg.freetype2,v 1.27.10.1 2020/10/21 17:08:59 spz Exp $
 #
 bin/freetype-config
 include/freetype2/config/ftconfig.h
@ -14,6 +14,9 @@ include/freetype2/freetype/config/ftheader.h
 include/freetype2/freetype/config/ftmodule.h
 include/freetype2/freetype/config/ftoption.h
 include/freetype2/freetype/config/ftstdlib.h
+include/freetype2/freetype/config/integer-types.h
+include/freetype2/freetype/config/mac-support.h
+include/freetype2/freetype/config/public-macros.h
 include/freetype2/freetype/freetype.h
 include/freetype2/freetype/ftadvanc.h
 include/freetype2/freetype/ftautoh.h
--- a/print/ghostscript-agpl/Makefile
+++ b/print/ghostscript-agpl/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2020/09/13 14:16:30 leot Exp $
+# $NetBSD: Makefile,v 1.59.2.1 2020/10/23 11:17:44 spz Exp $

 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-agpl/}
@ -18,6 +18,7 @@ COMMENT=	Postscript interpreter
 LICENSE=	gnu-agpl-v3

 .include	"Makefile.common"
+PKGREVISION=	1

 DEPENDS+=		ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts

--- a/print/ghostscript-agpl/distinfo
+++ b/print/ghostscript-agpl/distinfo
@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.32 2020/09/20 08:28:24 wiz Exp $
+$NetBSD: distinfo,v 1.32.2.1 2020/10/23 11:17:44 spz Exp $

 SHA1 (ghostscript-9.53.1.tar.xz) = bc62c33d1dde52bcc46397a0b1996539b7cf85f7
 RMD160 (ghostscript-9.53.1.tar.xz) = 3154a35f3b891408c7e12f954f98147e60026fd4
 SHA512 (ghostscript-9.53.1.tar.xz) = 5c78ed0a03983cbf9d55885c5ee8fbfc987db367b020ad0148b8861de42923e38c688447cfc6efcea5521121545ecfbea9690058fd3c4438629a43b5990800c5
 Size (ghostscript-9.53.1.tar.xz) = 41362600 bytes
+SHA1 (patch-base_fapi__ft.c) = f074e2e8c2c6ea582a94001fabd970eaca1a8257
 SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
 SHA1 (patch-base_lib.mak) = 723926f167b49568376ef0c0da6aa4ec01fe1516
 SHA1 (patch-base_mkromfs.c) = 9d9afbd0fbb8c70c8f4f7de3cadc5b54541f0db0
--- a/print/ghostscript-agpl/patches/patch-base_fapi__ft.c
+++ b/print/ghostscript-agpl/patches/patch-base_fapi__ft.c
@ -0,0 +1,33 @@
+$NetBSD: patch-base_fapi__ft.c,v 1.1.2.2 2020/10/23 11:17:44 spz Exp $
+
+Build with FreeType 2.10.3.
+
+--- base/fapi_ft.c.orig	2020-09-14 13:40:08.000000000 +0000
+++ base/fapi_ft.c
+@@ -125,7 +125,7 @@ static void
+ delete_inc_int_info(gs_fapi_server * a_server,
+                     FT_IncrementalRec * a_inc_int_info);
+ 
+-FT_CALLBACK_DEF(void *)
+static void *
+ FF_alloc(FT_Memory memory, long size)
+ {
+     gs_memory_t *mem = (gs_memory_t *) memory->user;
+@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size)
+     return (gs_malloc(mem, size, 1, "FF_alloc"));
+ }
+ 
+-FT_CALLBACK_DEF(void *)
+static void *
+     FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block)
+ {
+     gs_memory_t *mem = (gs_memory_t *) memory->user;
+@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *)
+     return (tmp);
+ }
+ 
+-FT_CALLBACK_DEF(void)
+static void
+     FF_free(FT_Memory memory, void *block)
+ {
+     gs_memory_t *mem = (gs_memory_t *) memory->user;
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.263 2020/08/31 18:11:09 wiz Exp $
+# $NetBSD: Makefile,v 1.263.2.1 2020/12/11 08:50:56 bsiegert Exp $

-DISTNAME=	openssl-1.1.1g
-PKGREVISION=	3
+DISTNAME=	openssl-1.1.1i
 CATEGORIES=	security
 MASTER_SITES=	https://www.openssl.org/source/

@ -41,6 +40,8 @@ OPENSSL_HOST.SunOS-i386=	solaris-x86-gcc
 OPENSSL_HOST.SunOS-x86_64=	solaris64-x86_64-gcc
 OPENSSL_HOST.Darwin-aarch64=	darwin64-arm64-cc

+LDFLAGS.SunOS+=	-lrt
+
 .if defined(OPENSSL_HOST.${OPSYS}-${MACHINE_ARCH})
 CONFIG_SHELL=		${PERL5}
 CONFIGURE_SCRIPT=	./Configure
--- a/security/openssl/PLIST
+++ b/security/openssl/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/07/13 11:35:54 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.6.2.1 2020/12/11 08:50:56 bsiegert Exp $
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
@ -1028,6 +1028,7 @@ man/man3/EC_GROUP_set_seed.3
 man/man3/EC_KEY_check_key.3
 man/man3/EC_KEY_clear_flags.3
 man/man3/EC_KEY_copy.3
+man/man3/EC_KEY_decoded_from_explicit_params.3
 man/man3/EC_KEY_dup.3
 man/man3/EC_KEY_free.3
 man/man3/EC_KEY_generate_key.3
@ -3183,6 +3184,7 @@ man/man3/X509V3_EXT_i2d.3
 man/man3/X509V3_add1_i2d.3
 man/man3/X509V3_get_d2i.3
 man/man3/X509_ALGOR_cmp.3
+man/man3/X509_ALGOR_copy.3
 man/man3/X509_ALGOR_dup.3
 man/man3/X509_ALGOR_free.3
 man/man3/X509_ALGOR_get0.3
@ -3341,6 +3343,8 @@ man/man3/X509_REQ_get_signature_nid.3
 man/man3/X509_REQ_get_subject_name.3
 man/man3/X509_REQ_get_version.3
 man/man3/X509_REQ_new.3
+man/man3/X509_REQ_set0_signature.3
+man/man3/X509_REQ_set1_signature_algo.3
 man/man3/X509_REQ_set_pubkey.3
 man/man3/X509_REQ_set_subject_name.3
 man/man3/X509_REQ_set_version.3
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.144 2020/07/22 20:41:30 sjmulder Exp $
+$NetBSD: distinfo,v 1.144.2.2 2020/12/11 08:50:56 bsiegert Exp $

-SHA1 (openssl-1.1.1g.tar.gz) = b213a293f2127ec3e323fb3cfc0c9807664fd997
-RMD160 (openssl-1.1.1g.tar.gz) = 427b7b12c06715ad1c95d3ff5e38055c6bb66c1d
-SHA512 (openssl-1.1.1g.tar.gz) = 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab
-Size (openssl-1.1.1g.tar.gz) = 9801502 bytes
-SHA1 (patch-Configurations_10-main.conf) = d27643187e0b71041f47a9a7c7eec811f7539085
+SHA1 (openssl-1.1.1i.tar.gz) = eb684ba4ed31fe2c48062aead75233ecd36882a6
+RMD160 (openssl-1.1.1i.tar.gz) = 95a45fa7c2240dde179e8f8028f998bfa5177cc3
+SHA512 (openssl-1.1.1i.tar.gz) = fe12e0ab9e1688f24dd862ac633d0ab703b499c0f34b53c3560aa0d3879d81d647aa0678ed517dda5efb2711f669fcb1a1e0e24f6eac2efc2cf4eae6b62014d8
+Size (openssl-1.1.1i.tar.gz) = 9808346 bytes
 SHA1 (patch-Configurations_shared-info.pl) = 0e835f6e343b5d05ef9a0e6ef2a195201262d15c
-SHA1 (patch-Configurations_unix-Makefile.tmpl) = d58376dfc8cbb4c7d98ca64093759f173eac73da
+SHA1 (patch-Configurations_unix-Makefile.tmpl) = cf6b46c6e10e84100beb468bbe6f85c5e62cbe7a
 SHA1 (patch-Configure) = 479f1bc826f7721f6b44d6b5a6cf460432924bf2
-SHA1 (patch-crypto_rand_rand__unix.c) = 9aa1ff0b0ff1db3fcadacf8707596a7db852f956
--- a/security/openssl/patches/patch-Configurations_10-main.conf
+++ b/security/openssl/patches/patch-Configurations_10-main.conf
@ -1,22 +0,0 @@
-$NetBSD: patch-Configurations_10-main.conf,v 1.1 2020/07/22 20:41:30 sjmulder Exp $
-
-Add support for Apple Silicon. Imported from open pull request:
-https://github.com/openssl/openssl/pull/12369
-
--- Configurations/10-main.conf.orig	2020-04-21 12:22:39.000000000 +0000
-+++ Configurations/10-main.conf
-@@ -1557,6 +1557,14 @@ my %targets = (
-         bn_ops           => "SIXTY_FOUR_BIT_LONG",
-         perlasm_scheme   => "macosx",
-     },
-+    "darwin64-arm64-cc" => {
-+        inherit_from     => [ "darwin-common", asm("aarch64_asm") ],
-+        CFLAGS           => add("-Wall"),
-+        cflags           => add("-arch arm64"),
-+        lib_cppflags     => add("-DL_ENDIAN"),
-+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
-+        perlasm_scheme   => "ios64",
-+    },
- 
- ##### GNU Hurd
-     "hurd-x86" => {
--- a/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl
+++ b/security/openssl/patches/patch-Configurations_unix-Makefile.tmpl
@ -1,11 +1,13 @@
-$NetBSD: patch-Configurations_unix-Makefile.tmpl,v 1.2 2020/03/31 15:02:31 sevan Exp $
+$NetBSD: patch-Configurations_unix-Makefile.tmpl,v 1.2.4.1 2020/10/03 19:28:58 bsiegert Exp $

 Use pkgsrc layout.
 Do not install HTML documentation.
+Avoid -B $NUM argument to m4 (ignored by most m4 implementations, not
+supported by others)

--- Configurations/unix-Makefile.tmpl.orig	2020-03-31 14:23:39.098512410 +0000
-+++ Configurations/unix-Makefile.tmpl
-@@ -274,8 +274,9 @@ libdir={- File::Spec::Win32->file_name_i
+--- Configurations/unix-Makefile.tmpl.orig	2020-04-21 14:22:39.000000000 +0200
+++ Configurations/unix-Makefile.tmpl	2020-09-28 15:17:07.747914097 +0200
+@@ -274,8 +274,9 @@
           ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
 {- output_on() if $config{target} !~ /^mingw/; "" -}
 
@ -16,7 +18,7 @@ Do not install HTML documentation.
 HTMLDIR=$(DOCDIR)/html
 
 # MANSUFFIX is for the benefit of anyone who may want to have a suffix
-@@ -544,54 +545,54 @@ install_sw: install_dev install_engines 
+@@ -544,54 +545,54 @@
 
 uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
 
@ -100,3 +102,12 @@ Do not install HTML documentation.
 	fi
 
 install_dev: install_runtime_libs
+@@ -1058,7 +1059,7 @@
+           if ($args{generator}->[0] =~ /\.pl$/) {
+               $generator = 'CC="$(CC)" $(PERL)'.$generator_incs.' '.$generator;
+           } elsif ($args{generator}->[0] =~ /\.m4$/) {
+-              $generator = 'm4 -B 8192'.$generator_incs.' '.$generator.' >'
+              $generator = 'm4 '.$generator_incs.' '.$generator.' >'
+           } elsif ($args{generator}->[0] =~ /\.S$/) {
+               $generator = undef;
+           } else {
--- a/security/openssl/patches/patch-crypto_rand_rand__unix.c
+++ b/security/openssl/patches/patch-crypto_rand_rand__unix.c
@ -1,47 +0,0 @@
-$NetBSD: patch-crypto_rand_rand__unix.c,v 1.1 2020/04/30 11:21:57 nia Exp $
-
-Fix usage of KERN_ARND on NetBSD.
-
-First, actually include the correct headers.
-Second, disable a hack for old FreeBSD versions (just in case it gets used).
-Third, ensure that we don't ever request more than 256 bytes (just in case).
-
--- crypto/rand/rand_unix.c.orig	2020-04-21 12:22:39.000000000 +0000
-+++ crypto/rand/rand_unix.c
-@@ -26,12 +26,12 @@
- #  include <sys/utsname.h>
- # endif
- #endif
-#if defined(__FreeBSD__) && !defined(OPENSSL_SYS_UEFI)
-+#if (defined(__FreeBSD__) || defined(__NetBSD__)) && !defined(OPENSSL_SYS_UEFI)
- # include <sys/types.h>
- # include <sys/sysctl.h>
- # include <sys/param.h>
- #endif
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__OpenBSD__)
- # include <sys/param.h>
- #endif
- 
-@@ -247,10 +247,12 @@ static ssize_t sysctl_random(char *buf, 
-      * when the sysctl returns long and we want to request something not a
-      * multiple of longs, which should never be the case.
-      */
-+#if   defined(__FreeBSD__)
-     if (!ossl_assert(buflen % sizeof(long) == 0)) {
-         errno = EINVAL;
-         return -1;
-     }
-+#endif
- 
-     /*
-      * On NetBSD before 4.0 KERN_ARND was an alias for KERN_URND, and only
-@@ -268,7 +270,7 @@ static ssize_t sysctl_random(char *buf, 
-     mib[1] = KERN_ARND;
- 
-     do {
-        len = buflen;
-+        len = buflen > 256 ? 256 : buflen;
-         if (sysctl(mib, 2, buf, &len, NULL, 0) == -1)
-             return done > 0 ? done : -1;
-         done += len;
--- a/security/py-libtaxii/Makefile
+++ b/security/py-libtaxii/Makefile
@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2018/10/15 11:17:08 adam Exp $
+# $NetBSD: Makefile,v 1.10.16.1 2020/10/22 16:10:42 bsiegert Exp $

-DISTNAME=	libtaxii-1.1.111
+DISTNAME=	libtaxii-1.1.118
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security python
 #MASTER_SITES=	${MASTER_SITE_PYPI:=l/libtaxii/}
--- a/security/py-libtaxii/PLIST
+++ b/security/py-libtaxii/PLIST
@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/10/15 11:17:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.2.16.1 2020/10/22 16:10:42 bsiegert Exp $
 bin/collection_information_client
 bin/collection_information_client.py
 bin/discovery_client
@ -85,6 +85,9 @@ ${PYSITELIB}/libtaxii/taxii_default_query.pyo
 ${PYSITELIB}/libtaxii/test/__init__.py
 ${PYSITELIB}/libtaxii/test/__init__.pyc
 ${PYSITELIB}/libtaxii/test/__init__.pyo
+${PYSITELIB}/libtaxii/test/argument_parser_test.py
+${PYSITELIB}/libtaxii/test/argument_parser_test.pyc
+${PYSITELIB}/libtaxii/test/argument_parser_test.pyo
 ${PYSITELIB}/libtaxii/test/clients_test.py
 ${PYSITELIB}/libtaxii/test/clients_test.pyc
 ${PYSITELIB}/libtaxii/test/clients_test.pyo
--- a/security/py-libtaxii/distinfo
+++ b/security/py-libtaxii/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2018/10/15 11:17:08 adam Exp $
+$NetBSD: distinfo,v 1.4.16.1 2020/10/22 16:10:42 bsiegert Exp $

-SHA1 (libtaxii-1.1.111.tar.gz) = 50d0a37c0fc50e598d1a939d840d1584f4ebe6e7
-RMD160 (libtaxii-1.1.111.tar.gz) = af52c366c58847adbc0f28241063918b75cfd21b
-SHA512 (libtaxii-1.1.111.tar.gz) = f638317200bb0691c3f994a4d624295bb3b64f4aba249e5b04d5b831eb985550702ef1c7653ca41fd8bb3972cab1c9d524ec540f87bf8581a0c0799ee5a7f831
-Size (libtaxii-1.1.111.tar.gz) = 119071 bytes
+SHA1 (libtaxii-1.1.118.tar.gz) = 4ddd4b6b00666015b2420b9eed69baf1ba626659
+RMD160 (libtaxii-1.1.118.tar.gz) = cd0764a53bf1714f9e100392b8e967f03c93b4a2
+SHA512 (libtaxii-1.1.118.tar.gz) = 858571d6572c6362dd1a1c9e5d13aee0f341ea13b43ed9c96f6b0dddb5347fefdd580e4ae0ac2f8a85c8f8956b04aa16a15604014d069ef7d95a821f70f5f0bc
+Size (libtaxii-1.1.118.tar.gz) = 122071 bytes
--- a/security/tor-browser-noscript/Makefile
+++ b/security/tor-browser-noscript/Makefile
@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2020/09/23 19:03:10 wiz Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2020/11/10 07:27:56 bsiegert Exp $

-VERSION=	11.0.46
+VERSION=	11.1.3
 DISTNAME=	noscript-${VERSION}
 PKGNAME=	tor-browser-${DISTNAME}
 CATEGORIES=	security www
--- a/security/tor-browser-noscript/distinfo
+++ b/security/tor-browser-noscript/distinfo
@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2020/09/23 19:03:10 wiz Exp $
+$NetBSD: distinfo,v 1.6.2.1 2020/11/10 07:27:56 bsiegert Exp $

-SHA1 (noscript-11.0.46.xpi) = 1e992531c689efc78f51eaa17b528f2fca84268b
-RMD160 (noscript-11.0.46.xpi) = 3f99c467119beb73acf349e15d20b5cb4b70d1aa
-SHA512 (noscript-11.0.46.xpi) = 99094b84ff26b1ff324a64ba8647d234373e8af7509195c2b49644ee5d118dc4b02525d9f843977c024dbb5533b01745d7dcb87d59963f1bc824165c69f2f9af
-Size (noscript-11.0.46.xpi) = 599495 bytes
+SHA1 (noscript-11.1.3.xpi) = 2b3d4eea2e0db9088f6b610023d72a64aa164ebc
+RMD160 (noscript-11.1.3.xpi) = e75f74b041315845e8ac14ac191b6f6a131012a7
+SHA512 (noscript-11.1.3.xpi) = 476a48367a2ca3b6259702271a53dab7d5f584015b9f19eb8a595cb01619c2afc31195d976cb0d89e6214a91e189b305bc6ec9d628cd0ca1b2ab8a5884a8722d
+Size (noscript-11.1.3.xpi) = 601205 bytes
--- a/security/tor-browser/Makefile
+++ b/security/tor-browser/Makefile
@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2020/08/31 18:11:22 wiz Exp $
+# $NetBSD: Makefile,v 1.75.2.2 2020/11/10 17:23:29 bsiegert Exp $

-DISTNAME=	src-firefox-tor-browser-68.12.0esr-9.5-1-build1
-PKGNAME=	tor-browser-9.5.4
-PKGREVISION=	1
+DISTNAME=	src-firefox-tor-browser-78.4.0esr-10.0-2-build2
+PKGNAME=	tor-browser-10.0.2
 CATEGORIES=	security www
 MASTER_SITES=	https://dist.torproject.org/torbrowser/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
@ -25,7 +24,7 @@ DEPENDS+=	tor-browser-noscript>=11.0.32:../../security/tor-browser-noscript
 #
 # replace all patches with the one from the correspoding www/firefox${ESR_RELEASE}
 # compare e.g. the output of
-# diff -r -I NetBSD . ../../www/firefox68
+# diff -r -I NetBSD . ../../www/firefox78
 # BUT keep:
 # patch-.mozconfig (if still necessary)
 # patch-browser_app_profile_000-tor-browser.js
@ -50,6 +49,37 @@ SUBST_MESSAGE.fonts=	Fixing path to bundled fonts directory.

 MOZILLA_DIR=	# empty

+# Workaround for https://bugs.llvm.org/show_bug.cgi?id=46366
+BUILDLINK_TRANSFORM.NetBSD+=	rm:-fexperimental-new-pass-manager
+
+#
+# Generate list of subst entries for various .cargo-checksum.json files.  These
+# are all handled together in one big substitution to simplify things rather
+# than one substitution entry per file, but are kept separate below to ease
+# updating and verification.
+#
+
+CKSUM_CRATES+=	third_party/rust/libc
+
+# patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
+CKSUMS+=	a3540eab4dbc52e006e84e288bad17e1dae3865fea49020e0ed8b5a7724a9532
+CKSUMS+=	5e58a2109f5eff0f497dfac150c161c1d517a2227b49e086da96c3d66522ac3a
+
+CKSUM_CRATES+=	third_party/rust/getrandom
+
+# patch-third__party_rust_getrandom_src_lib.rs
+CKSUMS+=	0e52f6bde42d7bb05c297ce1c25b9879d61b28caba98f6226a152bff538db6c2
+CKSUMS+=	394425b4ba03c21c494e64d993678f7014575b1e3d590b9ee452b5c2d83ec4ac
+
+SUBST_CLASSES+=		cksum
+SUBST_STAGE.cksum=	pre-configure
+.for crate in ${CKSUM_CRATES}
+SUBST_FILES.cksum+=	${crate}/.cargo-checksum.json
+.endfor
+.for from to in ${CKSUMS}
+SUBST_SED.cksum+=	-e 's,${from},${to},g'
+.endfor
+
 .include "../../mk/bsd.prefs.mk"

 CONFIGURE_ARGS+=	--enable-tor-browser-data-outside-app-dir
@ -75,7 +105,7 @@ NOT_PAX_MPROTECT_SAFE+=	lib/${PKGBASE}/tor-browser-bin
 BUILDLINK_TRANSFORM.SunOS+=	rm:-fdata-sections
 BUILDLINK_TRANSFORM.SunOS+=	rm:-ffunction-sections

-.include "../../www/firefox68/mozilla-common.mk"
+.include "../../www/firefox78/mozilla-common.mk"
 .include "options.mk"

 CHECK_INTERPRETER_SKIP+=	lib/firefox-sdk/sdk/bin/header.py
--- a/security/tor-browser/PLIST
+++ b/security/tor-browser/PLIST
--- a/security/tor-browser/distinfo
+++ b/security/tor-browser/distinfo
@ -1,54 +1,58 @@
-$NetBSD: distinfo,v 1.28 2020/08/26 20:55:19 wiz Exp $
+$NetBSD: distinfo,v 1.28.2.2 2020/11/10 17:23:29 bsiegert Exp $

-SHA1 (src-firefox-tor-browser-68.12.0esr-9.5-1-build1.tar.xz) = 2d6081a8ad82e3095970f1d1a41f130024454e3d
-RMD160 (src-firefox-tor-browser-68.12.0esr-9.5-1-build1.tar.xz) = 7c262331bfc168604d03f8f59ef7f349055f4f5b
-SHA512 (src-firefox-tor-browser-68.12.0esr-9.5-1-build1.tar.xz) = 4674308ff40a65859c892a9a4e01e1506daded409e761c4ddb24d4f98ec73b63c86d2d051b05b1b8655dd5df894a59117752ee2e9a0c3e643577a3576c62aab3
-Size (src-firefox-tor-browser-68.12.0esr-9.5-1-build1.tar.xz) = 348639116 bytes
-SHA1 (tor-browser-linux64-9.5.4_en-US.tar.xz) = 8f4665912642c86e1161b788a7398478952107d8
-RMD160 (tor-browser-linux64-9.5.4_en-US.tar.xz) = 53025eff780989ece3f7089d272c1b6623519e6b
-SHA512 (tor-browser-linux64-9.5.4_en-US.tar.xz) = 2b69874c476e78c88eeae795cf530ed67b4319535dfbe092bb1e5cb83b9f1a021ea568ed1efeb61b0b5475d90495b3fd3005c51ec2d75d46c893b225e236dd66
-Size (tor-browser-linux64-9.5.4_en-US.tar.xz) = 79033640 bytes
-SHA1 (patch-.mozconfig) = 66fbb2f113091eee1f022cd656231f845b04b0f8
-SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c
+SHA1 (src-firefox-tor-browser-78.4.0esr-10.0-2-build2.tar.xz) = 58c2c7954b7b751c71f6cbd7944c4be3281d2105
+RMD160 (src-firefox-tor-browser-78.4.0esr-10.0-2-build2.tar.xz) = e773a61f364bd2a1c01fcd06fa714cb8ae7b7e56
+SHA512 (src-firefox-tor-browser-78.4.0esr-10.0-2-build2.tar.xz) = 2f7a4783a67faae0c889bc106477c5039a02590722a7d23e88afe9db58916e882695407ad55268da8c70af3dc606ec953b1107ca89ab01a6bfd92f0f569a149e
+Size (src-firefox-tor-browser-78.4.0esr-10.0-2-build2.tar.xz) = 364731008 bytes
+SHA1 (tor-browser-linux64-10.0.2_en-US.tar.xz) = 52594d90e3e08a5f17b3cb8333838765cdf0dae1
+RMD160 (tor-browser-linux64-10.0.2_en-US.tar.xz) = 8eae01e95e49a5f696bc8ade583ea1bd977a2c89
+SHA512 (tor-browser-linux64-10.0.2_en-US.tar.xz) = 01399c058fdb6d0d18bfe4e21ac9890d7d7a7d6ad8db1beed4087b7730a9c0aaebad870f3442e86e27b65f5073406ad49894a7eb7f355041411d83274a853220
+Size (tor-browser-linux64-10.0.2_en-US.tar.xz) = 85903736 bytes
+SHA1 (patch-.mozconfig) = 949472d011d40b02146c06e90ed07673667d192b
+SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7
 SHA1 (patch-browser_app_profile_000-tor-browser.js) = 84a0a15605fff0e22f3150bce901a296fc920280
-SHA1 (patch-browser_app_profile_firefox.js) = cf93582b68b8d4e72c3c25682ab9138e185418c8
-SHA1 (patch-build_moz.configure_rust.configure) = b57a9b1451dc426d75774f73d7c05fc98fe6e317
-SHA1 (patch-config_gcc-stl-wrapper.template.h) = 11b45e0c7a9399c5b74b170648280a388dd67d89
-SHA1 (patch-config_makefiles_rust.mk) = 41f88d91b3ebcc55085b3e6c37f9ec2995fc9c7b
+SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0
+SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8
+SHA1 (patch-config_gcc-stl-wrapper.template.h) = 781a063fa6ab345face53fd88404ead11ab335b2
+SHA1 (patch-config_makefiles_rust.mk) = 8637cd3f56774648fd586c7ad8dd49e269b9eb2a
+SHA1 (patch-configure.in) = b40651b008dcecc49664660ac376df2bd7c2c6be
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
-SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24
-SHA1 (patch-dom_webauthn_u2f-hid-rs_src_lib.rs) = c0dfe8b1e7ebbc7c1d6066c204030f13b063b8d7
-SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_device.rs) = 091ffab5bd6a15425acb2ab023cc26f6b23324c6
-SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_fd.rs) = 57f5c3c879b07375234e5cb0cbe0469b15105a6a
-SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_mod.rs) = 7160fc9fe6d197b42104856b997337f823d2a791
-SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_monitor.rs) = 527722bd4fbf0aca07d710e0a8b73f95b2adad40
-SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_transaction.rs) = aeafe7c1df614bb5e46cb7fb1cb351001f292caf
-SHA1 (patch-dom_webauthn_u2f-hid-rs_src_netbsd_uhid.rs) = c1d2157350803fb3eaef6f7a00e7c81dd9cf708b
+SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
-SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2c909a10a341e600392417240ad0c556f495d6ba
+SHA1 (patch-gfx_cairo_cairo_src_cairo-type1-subset.c) = 89a9d934ef76706c552c0b81e6cbc0f45b1ffd2c
 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
-SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = e4a25e4a96055b1c42ec018b02d1828257a571de
+SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = f6f8996f0818a1b890698c7cc5054d49cb1e8924
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
-SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = d634805bf3b02475081cb2f263e91e3f4c481a29
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
-SHA1 (patch-js_src_threading_posix_Thread.cpp) = 47e612a676e614fd6dd43b8a3140218a3fbdc7fa
-SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35
+SHA1 (patch-js_src_jsfriendapi.h) = 6bbb895b882ee24929f011751c42732215e153a2
+SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
-SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4
-SHA1 (patch-media_libcubeb_src_cubeb.c) = dcc173f0bef8b7b12c45739bf04577f3292a517e
-SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a
-SHA1 (patch-media_libcubeb_src_moz.build) = 7d66d9e0d7129b2106885201f88355262ee1a22a
-SHA1 (patch-media_libcubeb_update.sh) = 8dcc4ca8e2812b4063f28e5d6308abbee0b1c9d9
+SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 31536f36cb33f16da309527b50eda9b721608115
+SHA1 (patch-media_libcubeb_src_cubeb__sun.c) = a8e03bc95850f83fd7ee3985c7cdb700981aa019
+SHA1 (patch-media_libcubeb_src_moz.build) = e4e64a1135cf4157ae5b6f7c1710ebd076953479
 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
-SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = c39a222c5ab16c26cb214e5e53a0b61291a00512
-SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf
-SHA1 (patch-toolkit_library_moz.build) = 57516a1cc888fdbaf39ba90f73e5de488ad1f01e
+SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f
+SHA1 (patch-media_libvorbis_lib_vorbis__info.c) = b6b1a84a095db8459bdff24c04f4d56886ddbe45
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 2ab6dee0a90bcf8427bc65784108ad33e17f6f9e
+SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 13e512c7ee9fa1e14ba415d62fa853e5fbfc91c0
+SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = a7cd867916524770609d1c307a65b315b88456f4
+SHA1 (patch-third__party_rust_authenticator_.cargo-checksum.json) = 0c230417f33fca9e27bbb30a9ac80b864cd8c1e2
+SHA1 (patch-third__party_rust_authenticator_src_lib.rs) = 5b1d1c3c6db7876aace3c6bb056f8434ca740350
+SHA1 (patch-third__party_rust_authenticator_src_netbsd_device.rs) = 72af2ec76f32a7d8b4f25d30a383343d0f624059
+SHA1 (patch-third__party_rust_authenticator_src_netbsd_fd.rs) = fdbe7db081afa1ee2a1b71e96886f72c2a691d7e
+SHA1 (patch-third__party_rust_authenticator_src_netbsd_mod.rs) = 80f50157fb23f2e1de579b62148708c52822831b
+SHA1 (patch-third__party_rust_authenticator_src_netbsd_monitor.rs) = 95dbbdb7608230e01b50c7399a9734a74d1086c7
+SHA1 (patch-third__party_rust_authenticator_src_netbsd_transaction.rs) = 0f3d490b2b7cec5e47b3adc9187b58eaa70350d1
+SHA1 (patch-third__party_rust_authenticator_src_netbsd_uhid.rs) = e0856c37eb1d73bca431da6048132233eace44bb
+SHA1 (patch-third__party_rust_getrandom_src_lib.rs) = 2ad80d10ebfeef0dc27435fc2c16be7b5e5d444a
+SHA1 (patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 3755f32fea84900cc0f00af3d9f53ed5fcfb0b4b
+SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5a516d377d491e0504aaf2d7aed04bb9ebeccc56
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12
-SHA1 (patch-toolkit_moz.configure) = 9f4edca09802f6d3adb517613e879dca8d2d65be
-SHA1 (patch-toolkit_mozapps_installer_packager.mk) = b2343fbad2556504dfd13601c02e6e2357c7d2bc
-SHA1 (patch-toolkit_xre_glxtest.cpp) = 04942938f45f326c7d5c4da3bf8cc2d09b977c69
+SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57
+SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 706635b76a7b525794aba95e95544f09e18bb662
+SHA1 (patch-widget_gtk_WaylandDMABufSurface.cpp) = 3c556b9321a5045363a1d567ea271c520f585850
 SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec
 SHA1 (patch-xpcom_io_TorFileUtils.cpp) = 3f5c5490a3e4e0117cca3c558de93f2ffea05405
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 6956c90d4c74c71e7e9a5882e4840ba2673160fa
--- a/security/tor-browser/patches/patch-.mozconfig
+++ b/security/tor-browser/patches/patch-.mozconfig
@ -1,14 +1,14 @@
-$NetBSD: patch-.mozconfig,v 1.2 2020/03/13 17:59:27 wiz Exp $
+$NetBSD: patch-.mozconfig,v 1.2.6.1 2020/10/23 17:27:12 bsiegert Exp $

 mozbuild.configure.options.InvalidOptionError: --disable-eme is not available in this configuration
 disable tor-launcher - assume tor is started as system process

--- .mozconfig.orig	2019-11-15 18:55:41.526147002 +0000
+--- .mozconfig.orig	2020-09-19 17:21:46.000000000 +0000
 +++ .mozconfig
-@@ -20,8 +20,7 @@ ac_add_options --disable-tests
- ac_add_options --disable-debug
+@@ -26,8 +26,7 @@ ac_add_options --disable-debug
 ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
+ ac_add_options --disable-parental-controls
 -# Let's make sure no preference is enabling either Adobe's or Google's CDM.
 -ac_add_options --disable-eme
 +ac_add_options --disable-tor-launcher
--- a/security/tor-browser/patches/patch-aa
+++ b/security/tor-browser/patches/patch-aa
@ -1,10 +1,11 @@
-$NetBSD: patch-aa,v 1.6 2020/03/13 17:59:27 wiz Exp $
+$NetBSD: patch-aa,v 1.6.6.1 2020/10/23 17:27:12 bsiegert Exp $

 * Add Sun audio support
+* Include include/nss/nss for workaround for neqo-crypto 0.1.6 of firefox-72.0

--- old-configure.in.orig	2020-03-05 20:57:20.000000000 +0000
-+++ old-configure.in
-@@ -1987,6 +1987,19 @@ MOZ_WEBM_ENCODER=1
+--- old-configure.in.orig	Tue Jan  7 17:23:36 2020
+++ old-configure.in	Fri Jan 17 16:03:40 2020
+@@ -1960,6 +1960,19 @@
 AC_DEFINE(MOZ_WEBM_ENCODER)
 AC_SUBST(MOZ_WEBM_ENCODER)
 
@ -24,3 +25,12 @@ $NetBSD: patch-aa,v 1.6 2020/03/13 17:59:27 wiz Exp $
 dnl ========================================================
 dnl NegotiateAuth
 dnl ========================================================
+@@ -2744,7 +2757,7 @@
+ AC_SUBST_LIST(MOZ_CAIRO_OSLIBS)
+ AC_SUBST(MOZ_TREE_PIXMAN)
+ 
+-BINDGEN_SYSTEM_FLAGS="$_BINDGEN_CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $MOZ_PIXMAN_CFLAGS $MOZ_CAIRO_CFLAGS"
+BINDGEN_SYSTEM_FLAGS="$_BINDGEN_CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $MOZ_PIXMAN_CFLAGS $MOZ_CAIRO_CFLAGS -I${PREFIX}/include/nss/nss"
+ AC_SUBST(BINDGEN_SYSTEM_FLAGS)
+ BINDGEN_SYSTEM_TOML_FLAGS="$BINDGEN_SYSTEM_FLAGS"
+ AC_SUBST_TOML_LIST(BINDGEN_SYSTEM_TOML_FLAGS)
--- a/security/tor-browser/patches/patch-browser_app_profile_firefox.js
+++ b/security/tor-browser/patches/patch-browser_app_profile_firefox.js
@ -1,8 +1,8 @@
-$NetBSD: patch-browser_app_profile_firefox.js,v 1.3 2020/06/18 12:56:40 wiz Exp $
+$NetBSD: patch-browser_app_profile_firefox.js,v 1.3.4.1 2020/10/23 17:27:12 bsiegert Exp $

--- browser/app/profile/firefox.js.orig	2020-05-28 00:01:33.000000000 +0000
+--- browser/app/profile/firefox.js.orig	2019-07-06 01:48:29.000000000 +0000
 +++ browser/app/profile/firefox.js
-@@ -1862,6 +1862,12 @@ pref("prio.publicKeyB", "26E6674E65425B8
+@@ -1851,6 +1851,12 @@ pref("fission.frontend.simulate-messages
 pref("toolkit.coverage.enabled", false);
 pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org");
 
--- a/security/tor-browser/patches/patch-build_moz.configure_rust.configure
+++ b/security/tor-browser/patches/patch-build_moz.configure_rust.configure
@ -1,11 +1,11 @@
-$NetBSD: patch-build_moz.configure_rust.configure,v 1.3 2020/06/07 13:06:00 wiz Exp $
+$NetBSD: patch-build_moz.configure_rust.configure,v 1.3.4.1 2020/10/23 17:27:12 bsiegert Exp $

 * Do not match rumprun toolchain for NetBSD,
  narrowed should be one not two.

--- build/moz.configure/rust.configure.orig	2020-05-28 00:01:39.000000000 +0000
+--- build/moz.configure/rust.configure.orig	2019-10-10 18:07:24.000000000 +0000
 +++ build/moz.configure/rust.configure
-@@ -330,7 +330,8 @@ def rust_triple_alias(host_or_target):
+@@ -321,7 +321,8 @@ def rust_triple_alias(host_or_target, ho
             narrowed = [
                 c for c in candidates
                 if c.target.raw_os == host_or_target.raw_os and
--- a/security/tor-browser/patches/patch-config_gcc-stl-wrapper.template.h
+++ b/security/tor-browser/patches/patch-config_gcc-stl-wrapper.template.h
@ -1,8 +1,8 @@
-$NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.1 2020/07/04 08:33:57 wiz Exp $
+$NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.1.4.1 2020/10/23 17:27:12 bsiegert Exp $

--- config/gcc-stl-wrapper.template.h.orig	2020-03-05 20:56:39.000000000 +0000
+--- config/gcc-stl-wrapper.template.h.orig	2020-04-03 19:34:34.000000000 +0000
 +++ config/gcc-stl-wrapper.template.h
-@@ -28,14 +28,14 @@
+@@ -28,8 +28,8 @@
 #endif
 
 // Don't include mozalloc for cstdlib. See bug 1245076.
@ -12,6 +12,8 @@ $NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.1 2020/07/04 08:33:57 wiz E
 +#  define moz_dont_include_mozalloc_for_${HEADER}
 #endif
 
+ #ifndef moz_dont_include_mozalloc_for_type_traits
+@@ -43,7 +43,7 @@
 // Include mozalloc after the STL header and all other headers it includes
 // have been preprocessed.
 #if !defined(MOZ_INCLUDE_MOZALLOC_H) && \
@ -20,7 +22,7 @@ $NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.1 2020/07/04 08:33:57 wiz E
 #  define MOZ_INCLUDE_MOZALLOC_H
 #  define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER}
 #endif
-@@ -64,4 +64,6 @@
+@@ -72,4 +72,6 @@
 #  include "mozilla/throw_gcc.h"
 #endif
 
--- a/security/tor-browser/patches/patch-config_makefiles_rust.mk
+++ b/security/tor-browser/patches/patch-config_makefiles_rust.mk
@ -1,17 +1,17 @@
-$NetBSD: patch-config_makefiles_rust.mk,v 1.2 2020/08/26 20:55:19 wiz Exp $
+$NetBSD: patch-config_makefiles_rust.mk,v 1.2.4.1 2020/10/23 17:27:12 bsiegert Exp $

-NetBSD<10 doesn't get along with parallel rust builds (it causes issues
+NetBSD doesn't get along with parallel rust builds (it causes issues
 with ld.so) which are the default. Force -j1.

--- config/makefiles/rust.mk.orig	2020-08-18 09:41:09.000000000 +0000
+--- config/makefiles/rust.mk.orig	2020-04-03 19:34:34.000000000 +0000
 +++ config/makefiles/rust.mk
-@@ -59,6 +59,9 @@ endif
- ifdef CARGO_INCREMENTAL
- export CARGO_INCREMENTAL
+@@ -52,6 +52,9 @@ endif
+ ifeq (1,$(MOZ_PARALLEL_BUILD))
+ cargo_build_flags += -j1
 endif
 +ifeq ($(OS_ARCH),NetBSD)
 +cargo_build_flags += -j1
 +endif
 
- rustflags_neon =
- ifeq (neon,$(MOZ_FPU))
+ # These flags are passed via `cargo rustc` and only apply to the final rustc
+ # invocation (i.e., only the top-level crate, not its dependencies).
--- a/security/tor-browser/patches/patch-configure.in
+++ b/security/tor-browser/patches/patch-configure.in
@ -0,0 +1,12 @@
+$NetBSD: patch-configure.in,v 1.1.2.2 2020/10/23 17:27:12 bsiegert Exp $
+
+* Accept Python 3.x from pkgsrc.
+
+--- configure.in.orig	2020-05-21 22:37:47.000000000 +0000
+++ configure.in
+@@ -22,4 +22,4 @@ SRCDIR=$(dirname $0)
+ TOPSRCDIR="$SRCDIR"
+ export OLD_CONFIGURE="$SRCDIR"/old-configure
+ 
+-exec python3 "$TOPSRCDIR/configure.py" "$@"
+exec ${PYTHON3} "$TOPSRCDIR/configure.py" "$@"
--- a/security/tor-browser/patches/patch-dom_media_CubebUtils.cpp
+++ b/security/tor-browser/patches/patch-dom_media_CubebUtils.cpp
@ -1,10 +1,8 @@
-$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.2 2020/03/13 17:59:27 wiz Exp $
+$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.2.6.1 2020/10/23 17:27:12 bsiegert Exp $

-Add Sun audio support.
-
--- dom/media/CubebUtils.cpp.orig	2019-07-06 01:48:31.000000000 +0000
+--- dom/media/CubebUtils.cpp.orig	Wed Jan  8 01:23:31 2020
 +++ dom/media/CubebUtils.cpp
-@@ -163,7 +163,7 @@ const char kBrandBundleURL[] = "chrome:/
+@@ -140,7 +140,7 @@ const char kBrandBundleURL[] = "chrome://branding/loca
 
 const char* AUDIOSTREAM_BACKEND_ID_STR[] = {
     "jack",  "pulse",       "alsa",  "audiounit", "audioqueue", "wasapi",
--- a/security/tor-browser/patches/patch-gfx_cairo_cairo_src_cairo-type1-subset.c
+++ b/security/tor-browser/patches/patch-gfx_cairo_cairo_src_cairo-type1-subset.c
@ -0,0 +1,19 @@
+$NetBSD: patch-gfx_cairo_cairo_src_cairo-type1-subset.c,v 1.1.2.2 2020/10/23 17:27:13 bsiegert Exp $
+
+Fix undefined behavior when calling <ctype.h> functions with illegal values.
+
+gfx/cairo/cairo/src/cairo-type1-subset.c:273:11: error: array subscript is of type 'char' [-Werror,-Wchar-subscripts]
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1642081
+
+--- gfx/cairo/cairo/src/cairo-type1-subset.c.orig	2020-05-07 18:34:10.000000000 +0000
+++ gfx/cairo/cairo/src/cairo-type1-subset.c
+@@ -270,7 +270,7 @@ cairo_type1_font_subset_find_segments (c
+ 	font->eexec_segment = (char *) p + font->header_segment_size;
+ 	font->eexec_segment_is_ascii = TRUE;
+ 	for (i = 0; i < 4; i++) {
+-	    if (!isxdigit(font->eexec_segment[i]))
+	    if (!isxdigit((unsigned char) font->eexec_segment[i]))
+ 		font->eexec_segment_is_ascii = FALSE;
+ 	}
+     }
--- a/security/tor-browser/patches/patch-gfx_gl_GLContextProviderGLX.cpp
+++ b/security/tor-browser/patches/patch-gfx_gl_GLContextProviderGLX.cpp
@ -1,17 +0,0 @@
-$NetBSD: patch-gfx_gl_GLContextProviderGLX.cpp,v 1.4 2020/03/13 17:59:27 wiz Exp $
-
-NetBSD doesn't ship libGL.so.1 due to a major bump. Look for the unversioned
-name.
-https://hg.mozilla.org/integration/mozilla-inbound/rev/8bcc51aaa91e
-
--- gfx/gl/GLContextProviderGLX.cpp.orig	2019-05-17 00:33:26.000000000 +0000
-+++ gfx/gl/GLContextProviderGLX.cpp
-@@ -80,7 +80,7 @@ bool GLXLibrary::EnsureInitialized() {
-     // which trigger glibc bug
-     // http://sourceware.org/bugzilla/show_bug.cgi?id=12225
-     const char* libGLfilename = "libGL.so.1";
-#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
-     libGLfilename = "libGL.so";
- #endif
- 
--- a/security/tor-browser/patches/patch-gfx_thebes_gfxPlatform.cpp
+++ b/security/tor-browser/patches/patch-gfx_thebes_gfxPlatform.cpp
@ -1,13 +1,13 @@
-$NetBSD: patch-gfx_thebes_gfxPlatform.cpp,v 1.1 2020/06/18 12:56:40 wiz Exp $
+$NetBSD: patch-gfx_thebes_gfxPlatform.cpp,v 1.1.4.1 2020/10/23 17:27:13 bsiegert Exp $

 Don't rely on CrossProcessSemaphore on NetBSD. It has some implementation
 issues that cause issues (kern/55386, not available on NetBSD<9)

 This idea is borrowed from macOS which has the same limitation.

--- gfx/thebes/gfxPlatform.cpp.orig	2020-05-28 00:01:45.000000000 +0000
+--- gfx/thebes/gfxPlatform.cpp.orig	2020-06-03 01:04:50.000000000 +0000
 +++ gfx/thebes/gfxPlatform.cpp
-@@ -2991,6 +2991,10 @@ bool gfxPlatform::UsesOffMainThreadCompo
+@@ -2922,6 +2922,10 @@ bool gfxPlatform::UsesOffMainThreadCompo
 }
 
 bool gfxPlatform::UsesTiling() const {
@ -18,10 +18,10 @@ This idea is borrowed from macOS which has the same limitation.
   bool usesSkia = GetDefaultContentBackend() == BackendType::SKIA;
 
   // We can't just test whether the PaintThread is initialized here because
-@@ -3002,6 +3006,7 @@ bool gfxPlatform::UsesTiling() const {
- 
-   return gfxPrefs::LayersTilesEnabled() ||
-          (gfxPrefs::LayersTilesEnabledIfSkiaPOMTP() && usesSkia && usesPOMTP);
+@@ -2934,6 +2938,7 @@ bool gfxPlatform::UsesTiling() const {
+   return StaticPrefs::layers_enable_tiles_AtStartup() ||
+          (StaticPrefs::layers_enable_tiles_if_skia_pomtp_AtStartup() &&
+           usesSkia && usesPOMTP);
 +#endif
 }
 
--- a/security/tor-browser/patches/patch-ipc_chromium_src_chrome_common_ipcchannelposix.cc
+++ b/security/tor-browser/patches/patch-ipc_chromium_src_chrome_common_ipcchannelposix.cc
@ -1,31 +0,0 @@
-$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc,v 1.1 2020/03/13 17:59:27 wiz Exp $
-
-In the original code there is a special case for Darwin whose
-sendmsg(2) fails with EMSGSIZE when a fd is to be transferred but
-there isn't enough space in the send buffer. It turned out the same
-applies to NetBSD too. It may affect other BSD kernels as well, but we
-haven't tested them.
-
-Please remove this patch when the upstream issue is resolved:
-https://bugzilla.mozilla.org/show_bug.cgi?id=1553389
-
--- ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig	2019-05-10 06:37:41.200812057 +0000
-+++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc
-@@ -9,7 +9,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
-#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_NETBSD)
- #  include <sched.h>
- #endif
- #include <stddef.h>
-@@ -699,7 +699,7 @@ bool Channel::ChannelImpl::ProcessOutgoi
-           // Not an error; the sendmsg would have blocked, so return to the
-           // event loop and try again later.
-           break;
-#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_NETBSD)
-           // (Note: this comment is copied from https://crrev.com/86c3d9ef4fdf6;
-           // see also bug 1142693 comment #73.)
-           //
--- a/security/tor-browser/patches/patch-js_src_jsfriendapi.h
+++ b/security/tor-browser/patches/patch-js_src_jsfriendapi.h
@ -0,0 +1,14 @@
+$NetBSD: patch-js_src_jsfriendapi.h,v 1.1.2.2 2020/10/23 17:27:13 bsiegert Exp $
+
+* Fix va_list error.
+
+--- js/src/jsfriendapi.h.orig	2020-05-22 02:11:19.000000000 +0000
+++ js/src/jsfriendapi.h
+@@ -14,6 +14,7 @@
+ #include "mozilla/PodOperations.h"
+ #include "mozilla/UniquePtr.h"
+ 
+#include <stdarg.h>
+ #include "jspubtd.h"
+ 
+ #include "js/CallArgs.h"
--- a/security/tor-browser/patches/patch-js_src_threading_posix_Thread.cpp
+++ b/security/tor-browser/patches/patch-js_src_threading_posix_Thread.cpp
@ -1,15 +0,0 @@
-$NetBSD: patch-js_src_threading_posix_Thread.cpp,v 1.2 2020/03/13 17:59:27 wiz Exp $
-
-Support SunOS.
-
--- js/src/threading/posix/Thread.cpp.orig	2018-06-05 19:47:32.000000000 +0000
-+++ js/src/threading/posix/Thread.cpp
-@@ -194,6 +194,8 @@ js::ThisThread::SetName(const char* name
-   rv = 0;
- #elif defined(__NetBSD__)
-   rv = pthread_setname_np(pthread_self(), "%s", (void*)name);
-+#elif defined(__sun)
-+  rv = 0;
- #else
-   rv = pthread_setname_np(pthread_self(), name);
- #endif
--- a/security/tor-browser/patches/patch-js_src_util_NativeStack.cpp
+++ b/security/tor-browser/patches/patch-js_src_util_NativeStack.cpp
@ -1,8 +1,8 @@
-$NetBSD: patch-js_src_util_NativeStack.cpp,v 1.4 2020/03/13 17:59:27 wiz Exp $
+$NetBSD: patch-js_src_util_NativeStack.cpp,v 1.4.6.1 2020/10/23 17:27:13 bsiegert Exp $

 Support SunOS.

--- js/src/util/NativeStack.cpp.orig	2019-03-07 16:53:39.000000000 +0000
+--- js/src/util/NativeStack.cpp.orig	2020-04-03 19:34:51.000000000 +0000
 +++ js/src/util/NativeStack.cpp
@@ -13,7 +13,7 @@
 #  if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
@ -20,7 +20,7 @@ Support SunOS.
 -#elif defined(SOLARIS)
 +#elif defined(__sun)
 
- JS_STATIC_ASSERT(JS_STACK_GROWTH_DIRECTION < 0);
+ static_assert(JS_STACK_GROWTH_DIRECTION < 0);
 
@@ -128,6 +128,7 @@ void* js::GetNativeStackBaseImpl() {
 #    elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
--- a/Show More
+++ b/Show More